diff options
| author | Daniel Xie <dxie@google.com> | 2015-09-01 09:55:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 09:55:20 +0000 |
| commit | df00063926ecc88f439506cc05594bb392e02a58 (patch) | |
| tree | 6ccbb06274c0e5ab0d2e7bdf6f43613478b61ae2 /annotations/generate_annotated_java_files.py | |
| parent | 24a2048498e80cbc8602f56169d9f6875ddb9488 (diff) | |
| parent | 2b6c35362abafa59dd5bde1e33f6c2b77803d31e (diff) | |
am 2b6c3536: (-s ours) am 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3 -s ours
* commit '2b6c35362abafa59dd5bde1e33f6c2b77803d31e':
DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions