Commit 5846c3ff authored by Kenny Root's avatar Kenny Root Committed by android-build-merger
Browse files

Merge "DO NOT MERGE CipherTest: add test for multiple updateAAD calls" into... 

Merge "DO NOT MERGE CipherTest: add test for multiple updateAAD calls" into marshmallow-cts-dev am: 5a020161  -s ours am: bdedf741
am: a0341598

* commit 'a0341598':
  DO NOT MERGE CipherTest: add test for multiple updateAAD calls

Change-Id: I5c657292415538f3a2ec3902170ac9c8b2f8bb21
parents 80871bc8 a0341598
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment