Commit 4679dc10 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

* commit '696028e4':
  DO NOT MERGE CipherTest: test instance reuse with updateAAD

Change-Id: Ic15fd20c8c39a497261f44207475f0325540ef76
parents 7d226f33 696028e4
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