diff options
| author | Kenny Root <kroot@google.com> | 2016-05-03 17:24:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-03 17:24:35 +0000 |
| commit | bdedf7413710d33a7b5730684d47b1c85dfb4c4a (patch) | |
| tree | 6a7eee190d653ead46d3c97e8ec727716c373f6d /include/ScopedJavaUnicodeString.h | |
| parent | 696028e420337da16e863a97632082a6d8b011f7 (diff) | |
| parent | 5a020161665dd48af2811f4f5301426c759e0139 (diff) | |
Merge "DO NOT MERGE CipherTest: add test for multiple updateAAD calls" into marshmallow-cts-dev
am: 5a02016166 -s ours
* commit '5a020161665dd48af2811f4f5301426c759e0139':
DO NOT MERGE CipherTest: add test for multiple updateAAD calls
Change-Id: I59a028d5d69784553b9371b38eff2cbbeea8eb50
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions