diff options
| author | Daniel Xie <dxie@google.com> | 2015-09-01 20:00:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 20:00:04 +0000 |
| commit | d9ba9afced350e7ee4816e6129b259d05c3ce5e3 (patch) | |
| tree | 4a38d981fef0682951f25a6cbb588105046dd40e /annotations/generate_annotated_java_files.py | |
| parent | e64406909d5ba24f9f346eaa7760ea030f2d84c4 (diff) | |
| parent | 27c6acaf1c189e0c90ae15e84d35dcb41a5674f0 (diff) | |
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 '27c6acaf1c189e0c90ae15e84d35dcb41a5674f0':
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions