diff options
| author | Narayan Kamath <narayan@google.com> | 2016-04-11 18:36:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-11 18:36:57 +0000 |
| commit | c3c19ff9f0401b8ca56e93ab20ff783ba8930215 (patch) | |
| tree | 6770798b4a4f67f62a5450ac91c94dc8f51a197a /annotations/generate_annotated_java_files.py | |
| parent | 8e420077032654de5c075e3934be1b8d88599c3b (diff) | |
| parent | fe20752d89d81d10564bfb6c9b1eaede602f5847 (diff) | |
Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev
am: fe20752 -s ours
* commit 'fe20752d89d81d10564bfb6c9b1eaede602f5847':
DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time".
Change-Id: I4f13693aa4f7f34fef848ee3e83b445196f05ecb
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions