diff options
| author | Tina Zhou <tinazh@google.com> | 2017-04-13 18:44:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-13 18:44:37 +0000 |
| commit | 467009ec608b473236473f73e03552a10f8d4792 (patch) | |
| tree | 1059bd5604f8a64d4f65a5e52af291212cc3d760 /annotations/generate_annotated_java_files.py | |
| parent | 244e7d35568d57c5752a8ca06b40fd7c4b6da315 (diff) | |
| parent | 28c4f74bbd6d0100cf14d316a6f857b4008827d5 (diff) | |
Merge "DO NOT MERGE Fix test_getZoneStrings_GMT_short_names" into lollipop-mr1-cts-dev
am: 28c4f74bbd -s ours
Change-Id: I032dbfec4918448829b232c8815db5499782411e
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions