diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:43:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:43:51 +0000 |
| commit | e97358223e9b1e55aa14d62e98deb6c87c0f4095 (patch) | |
| tree | 3047d433583c2fb1beb97e04ad621a5c198228e2 /ojluni/annotations/hiddenapi/java/util/TimerTask.java | |
| parent | f421debad06752571b1f2caca40234e2b3620318 (diff) | |
| parent | a9cdeb3196287fbbbf25220bb42275fd49f546a0 (diff) | |
Merge "Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours" into oreo-mr1-cts-dev am: a9cdeb3196 -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 054315bd8e is in history
Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311
Change-Id: Ifea484192ca8d3cc6baec03dd8017380478e21af
Diffstat (limited to 'ojluni/annotations/hiddenapi/java/util/TimerTask.java')
0 files changed, 0 insertions, 0 deletions