diff options
| author | Daniel Xie <dxie@google.com> | 2016-05-03 17:27:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-03 17:27:17 +0000 |
| commit | a03415982b2f8f8f8f1ee8e14f95e5acfa54a8d8 (patch) | |
| tree | 6f761954ed66cf7e2efe64bd57922c695fd0a6d1 /include/ScopedJavaUnicodeString.h | |
| parent | 4679dc10449f628d72c91c2f4a9e17a1ecf16e3b (diff) | |
| parent | bdedf7413710d33a7b5730684d47b1c85dfb4c4a (diff) | |
Merge "DO NOT MERGE CipherTest: add test for multiple updateAAD calls" into marshmallow-cts-dev am: 5a02016166 -s ours
am: bdedf74137
* commit 'bdedf7413710d33a7b5730684d47b1c85dfb4c4a':
DO NOT MERGE CipherTest: add test for multiple updateAAD calls
Change-Id: I4661f654d144f663c3f6e6e4c19789d1f11e8eab
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions