Commit a8799bca authored by Daniel Xie's avatar Daniel Xie Committed by android-build-merger
Browse files

Merge "DO NOT MERGE CipherTest: test instance reuse with updateAAD" into... 

Merge "DO NOT MERGE CipherTest: test instance reuse with updateAAD" into marshmallow-cts-dev am: 0aa7ec19  -s ours am: 696028e4 am: 4679dc10
am: 80871bc8

* commit '80871bc8':
  DO NOT MERGE CipherTest: test instance reuse with updateAAD

Change-Id: I1bbcad50786282c211930dc82fee8b04a4ea63ae
parents f42bfad2 80871bc8
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