Commit bdedf741 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 marshmallow-cts-dev 

am: 5a020161  -s ours

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

Change-Id: I59a028d5d69784553b9371b38eff2cbbeea8eb50
parents 696028e4 5a020161
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