diff options
author | Daniel Xie <dxie@google.com> | 2015-09-01 09:14:51 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 09:14:51 +0000 |
commit | 25720de04b90708826a62944428578eb809f51f1 (patch) | |
tree | 9b483eba1d8884500cfc04e594560a138194ba78 /annotations/generate_annotated_java_files.py | |
parent | 2b6c35362abafa59dd5bde1e33f6c2b77803d31e (diff) | |
parent | 23fe202d2e3c85b7245648360211aa22547ea355 (diff) |
am 23fe202d: Merge "Fixes associated with the tzdata 2015a update" into lollipop-cts-dev
* commit '23fe202d2e3c85b7245648360211aa22547ea355':
Fixes associated with the tzdata 2015a update
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions