diff options
| author | Daniel Xie <dxie@google.com> | 2016-05-03 17:27:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-03 17:27:16 +0000 |
| commit | 4679dc10449f628d72c91c2f4a9e17a1ecf16e3b (patch) | |
| tree | 6f761954ed66cf7e2efe64bd57922c695fd0a6d1 /include/ScopedJavaUnicodeString.h | |
| parent | 7d226f338da5fea2fe0c1788f13a8eac1cb463d9 (diff) | |
| parent | 696028e420337da16e863a97632082a6d8b011f7 (diff) | |
Merge "DO NOT MERGE CipherTest: test instance reuse with updateAAD" into marshmallow-cts-dev am: 0aa7ec1978 -s ours
am: 696028e420
* commit '696028e420337da16e863a97632082a6d8b011f7':
DO NOT MERGE CipherTest: test instance reuse with updateAAD
Change-Id: Ic15fd20c8c39a497261f44207475f0325540ef76
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions