diff options
| author | Daniel Xie <dxie@google.com> | 2015-09-12 04:06:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-12 04:06:51 +0000 |
| commit | 3a8c0d1e1d3f2d434be47f525d60d83320f8b6c9 (patch) | |
| tree | 299434f810e5e249959f228350541098f1d84f92 /annotations/generate_annotated_java_files.py | |
| parent | 9b98f31fa9b7bcd7f46bfbb0d6281705904c6fe9 (diff) | |
| parent | cd8cc93f3558fde16bf25669cb9a57522c8b223a (diff) | |
am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev
* commit 'cd8cc93f3558fde16bf25669cb9a57522c8b223a':
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions