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 | 696028e420337da16e863a97632082a6d8b011f7 (patch) | |
| tree | 6a7eee190d653ead46d3c97e8ec727716c373f6d /annotations/generate_annotated_java_files.py | |
| parent | 8c8cfb630583ba5842e710bbf8f07c3a39413adb (diff) | |
| parent | 0aa7ec1978f740a106594ae2768e73207593a0b2 (diff) | |
Merge "DO NOT MERGE CipherTest: test instance reuse with updateAAD" into marshmallow-cts-dev
am: 0aa7ec1978 -s ours
* commit '0aa7ec1978f740a106594ae2768e73207593a0b2':
DO NOT MERGE CipherTest: test instance reuse with updateAAD
Change-Id: Ice3c406dbd72145d6ba2fdac313bfb3164dfb3cd
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions