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