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