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