diff options
| author | Neil Fuller <nfuller@google.com> | 2017-12-18 14:03:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 14:03:33 +0000 |
| commit | eab1e6b042b3179ace35c21df01295c76833b796 (patch) | |
| tree | 0d7012ac7d3e5014a544171894e31967766482b5 /annotations/generate_annotated_java_files.py | |
| parent | 996ca562eaf0b26ec47f6486e1bfc3316ed44016 (diff) | |
| parent | 703d4e200c715cc18182c5ee5293cf15fe8e4776 (diff) | |
Merge "DO NOT MERGE: Remove test that depends on tz data" into stage-aosp-oc-mr1-cts-dev
am: 703d4e200c -s ours
Change-Id: I83ec283ed32b9eff2e9a92a3a0be8939bdc96cbf
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions