diff options
| author | Tina Zhou <tinazh@google.com> | 2017-04-13 19:02:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-13 19:02:11 +0000 |
| commit | eb1e88ea7b1f51e300b24482ef42111e87ea17e3 (patch) | |
| tree | bfb303cce94ccb45bdb13fed463e7581f5b0b94b /annotations/generate_annotated_java_files.py | |
| parent | 223d39e4b3ea442b625e1b74ca0571152ea92a16 (diff) | |
| parent | 143a48bc27be9e661ee04508a33bd7980a925aec (diff) | |
Merge "Merge "Merge "DO NOT MERGE Fix test_getZoneStrings_GMT_short_names" into lollipop-mr1-cts-dev am: 28c4f74bbd -s ours" into marshmallow-cts-dev am: 16d3bc63f1 -s ours" into nougat-cts-dev
am: 143a48bc27 -s ours
Change-Id: I561ac130ed5b8ce1b04c1eeb6f244fe8d584e743
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions