Commit 80871bc8 authored by Kenny Root's avatar Kenny Root 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

* commit '4679dc10':
  DO NOT MERGE CipherTest: test instance reuse with updateAAD

Change-Id: Ia494e184f5a2a002359529d084aa7123a01723d1
parents 1e1d9662 4679dc10
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