diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 18:32:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 18:32:27 +0000 |
| commit | 0181865f4386649053a46048fdef401f6890d5f2 (patch) | |
| tree | 3b87c76d44a6973b48df0046c4ed7f6bd3b93f87 /include/ScopedJavaUnicodeString.h | |
| parent | e70b1a0864b2f15bdb7924c2320ec6a58f601a6f (diff) | |
| parent | 6d7a838f06d60bddefdf7e623a820885dae70499 (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 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: I0c82100f9c790158b9ebe9ac163b99ddef42b442
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions