diff options
| author | Kenny Root <kroot@google.com> | 2016-05-03 17:29:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-03 17:29:56 +0000 |
| commit | 80871bc8bb2f050c722915d92ce8ade5d5bc0e79 (patch) | |
| tree | 6f761954ed66cf7e2efe64bd57922c695fd0a6d1 /include/ScopedJavaUnicodeString.h | |
| parent | 1e1d9662f91bb8e313caeecc3d099289d2445013 (diff) | |
| parent | 4679dc10449f628d72c91c2f4a9e17a1ecf16e3b (diff) | |
Merge "DO NOT MERGE CipherTest: test instance reuse with updateAAD" into marshmallow-cts-dev am: 0aa7ec1978 -s ours am: 696028e420
am: 4679dc1044
* commit '4679dc10449f628d72c91c2f4a9e17a1ecf16e3b':
DO NOT MERGE CipherTest: test instance reuse with updateAAD
Change-Id: Ia494e184f5a2a002359529d084aa7123a01723d1
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions