Commit fd3e9bcb authored by Daniel Xie's avatar Daniel Xie 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
am: 5846c3ff

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

Change-Id: I7b774d07909f46b22511571c9c4db4a9514a03e3
parents a8799bca 5846c3ff
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