diff options
| author | Daniel Xie <dxie@google.com> | 2016-01-22 03:44:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-22 03:44:48 +0000 |
| commit | 15a3fb322b7f80c6c59a0692ae3cd675402438ab (patch) | |
| tree | 6770798b4a4f67f62a5450ac91c94dc8f51a197a /annotations/generate_annotated_java_files.py | |
| parent | 9c763fb49d7155a2251a582d0a2ecce4d6c9120a (diff) | |
| parent | e557db3a8981b36f8275c5f1b50ebe7a31a536a7 (diff) | |
Merge "DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework"." into kitkat-cts-dev am: c87ce529ff -s ours
am: e557db3a89 -s ours
* commit 'e557db3a8981b36f8275c5f1b50ebe7a31a536a7':
DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework".
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions