diff options
| author | Daniel Xie <dxie@google.com> | 2016-01-22 03:42:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-22 03:42:59 +0000 |
| commit | e557db3a8981b36f8275c5f1b50ebe7a31a536a7 (patch) | |
| tree | 6117c295131540d6cae92b159e8cf0f48d4ed554 /annotations/generate_annotated_java_files.py | |
| parent | a289f96778cf5e88406d6ccc8e85865fbe1d9f45 (diff) | |
| parent | c87ce529ff5fa925ab164a20cae625f38973875d (diff) | |
Merge "DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework"." into kitkat-cts-dev
am: c87ce529ff -s ours
* commit 'c87ce529ff5fa925ab164a20cae625f38973875d':
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