diff options
| author | Daniel Xie <dxie@google.com> | 2015-12-06 05:40:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-06 05:40:17 +0000 |
| commit | a289f96778cf5e88406d6ccc8e85865fbe1d9f45 (patch) | |
| tree | 6117c295131540d6cae92b159e8cf0f48d4ed554 /annotations/generate_annotated_java_files.py | |
| parent | 0b8078f8b9cd096e6d104a04e9e381c94fe3c106 (diff) | |
| parent | 779c726a7a24ae169cefacf2aa91cc54139a96ec (diff) | |
Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev
am: 779c726a7a
* commit '779c726a7a24ae169cefacf2aa91cc54139a96ec':
Fixes associated with the tzdata 2015a update
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions