diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 18:32:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 18:32:57 +0000 |
commit | 887558033eb1304e0a0a8f9f4f955e76a2368f6f (patch) | |
tree | d9a5a021a40216005c704aee4a55752915b781d8 /include/ScopedJavaUnicodeString.h | |
parent | 84846dc7e4ca6cabc23e4c9393be61f4d04dcad8 (diff) | |
parent | 0181865f4386649053a46048fdef401f6890d5f2 (diff) |
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 am: 0181865f43 -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: I46ca714561590377ad455169338678f0b333b4c0
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions