diff options
| author | Kenny Root <kroot@google.com> | 2016-05-03 17:29:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-03 17:29:57 +0000 |
| commit | 5846c3ffabc636b4ccf39721c186cffb5c9ff7f9 (patch) | |
| tree | 6f761954ed66cf7e2efe64bd57922c695fd0a6d1 /include/ScopedJavaUnicodeString.h | |
| parent | 80871bc8bb2f050c722915d92ce8ade5d5bc0e79 (diff) | |
| parent | a03415982b2f8f8f8f1ee8e14f95e5acfa54a8d8 (diff) | |
Merge "DO NOT MERGE CipherTest: add test for multiple updateAAD calls" into marshmallow-cts-dev am: 5a02016166 -s ours am: bdedf74137
am: a03415982b
* commit 'a03415982b2f8f8f8f1ee8e14f95e5acfa54a8d8':
DO NOT MERGE CipherTest: add test for multiple updateAAD calls
Change-Id: I5c657292415538f3a2ec3902170ac9c8b2f8bb21
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions