Commit 67f6d0eb authored by Kenny Root's avatar Kenny Root Committed by android-build-merger
Browse files

Merge changes from topic \'updateAadFix-mnc-dev\' into mnc-dev 

am: 7e4ec4fe

* commit '7e4ec4fe':
  CipherTest: add test for multiple updateAAD calls
  CipherTest: test instance reuse with updateAAD
parents 830b5ba6 7e4ec4fe
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