diff options
| author | Tina Zhou <tinazh@google.com> | 2017-04-13 18:50:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-13 18:50:38 +0000 |
| commit | 98121f9bcb203e013baf997d2b38348cb4ded3ba (patch) | |
| tree | 1a7cd73e496077eaade6381950e220c447a9137b /annotations/generate_annotated_java_files.py | |
| parent | 8de6ec43d2a498f312e833b1ee8a28b7710ac28b (diff) | |
| parent | 16d3bc63f12e27349f234a5d3907d72377c87f4d (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
Change-Id: Ia788c4c081b4ade7668d288612a777ecb9f7c9db
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions