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