diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-22 21:52:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-22 21:52:29 +0000 |
| commit | 9941add25ff13fedbc6366472d784c3b70b4aa01 (patch) | |
| tree | f2a06f5d94278abe39fcb6eb95caa2a7c0c2a88b /ojluni/annotations/hiddenapi/java/util/UUID.java | |
| parent | 4271ac6877553f112cb793dbeaf0b10dd03a9255 (diff) | |
| parent | dd7692f2bc7ef567bfe01501ebfae0a158aaa421 (diff) | |
Merge "Merge "Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours" into pie-cts-dev am: 525ebbc0d3 -s ours am: dd7692f2bc -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 7275c92b32 is in history
Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271
Change-Id: I50fd02721f2eb072defca6960bb6cafa09f76f13
Diffstat (limited to 'ojluni/annotations/hiddenapi/java/util/UUID.java')
0 files changed, 0 insertions, 0 deletions