diff options
| author | Android Merger <android-build-merger@google.com> | 2016-04-11 18:37:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-04-11 18:37:02 +0000 |
| commit | a76a5016f1ff8ecf6cedd4601cf3b5c4b45af627 (patch) | |
| tree | 6770798b4a4f67f62a5450ac91c94dc8f51a197a /annotations/generate_annotated_java_files.py | |
| parent | 8e420077032654de5c075e3934be1b8d88599c3b (diff) | |
| parent | c3c19ff9f0401b8ca56e93ab20ff783ba8930215 (diff) | |
Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev am: fe20752 -s ours" into lollipop-mr1-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions