diff options
| author | Tina Zhou <tinazh@google.com> | 2017-04-13 19:45:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-13 19:45:46 +0000 |
| commit | 2186f7f06f0d70edbc6e082738da484b2cdf679d (patch) | |
| tree | a981d75e1639a49fd591495a17518f682bfc6760 /annotations/generate_annotated_java_files.py | |
| parent | e25c7a776059a9775c34623da4963df22100376e (diff) | |
| parent | 932ee3255e2dee4bdaa7b31d9f896ea189778e2c (diff) | |
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 am: 46ec47b8af am: 1677d84768 am: 0a287e19d3 am: 48af8a945e -s ours am: d7aecd4a25 am: 8dbef348c8 am: 153860f633
am: 932ee3255e
Change-Id: I41a60b2f6784089c47bc37454c8da2f789365542
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions