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