diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2020-06-25 23:56:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:56:22 +0000 |
| commit | 99d4e29a387afc9fef85d740077b4a95e2ebd8c9 (patch) | |
| tree | 840924da66a82b6a7dbeb66fe6a58f37a9f9b64f /annotations/generate_annotated_java_files.py | |
| parent | aed21e1d8f223de444d8a46d6fec2047b4e6746f (diff) | |
| parent | f421debad06752571b1f2caca40234e2b3620318 (diff) | |
[automerger skipped] [automerger] Merge "Track tzdb 2020a changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40 am: f940c558b5 am: 7b8e53209f am: 68f384c726 am: 253022fb25 am: 40190e4698 am: e31a931447 -s ours am: 0695b8ab58 -s ours am: f421debad0 -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 9b207b42dc is in history
Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311
Change-Id: I8280ae9bd0f85e62bc2310f16480096298550f0f
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions