diff options
| author | Daniel Xie <dxie@google.com> | 2015-09-01 20:13:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 20:13:39 +0000 |
| commit | e2194ccaa1914f1d08bff6d23d47e53203ccf63f (patch) | |
| tree | 3c33a58425b68749714b711ef240fa05104b5a17 /annotations/generate_annotated_java_files.py | |
| parent | 7634c9540ad2b629844f3fdc2b0c2da01b47ee3d (diff) | |
| parent | d9ba9afced350e7ee4816e6129b259d05c3ce5e3 (diff) | |
am d9ba9afc: (-s ours) am 27c6acaf: (-s ours) am f6fecb58: (-s ours) am df000639: (-s ours) 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 'd9ba9afced350e7ee4816e6129b259d05c3ce5e3':
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions