diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 19:00:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 19:00:16 +0000 |
| commit | 79db781a13d35dfff75c131e2cb77cbbd3dff717 (patch) | |
| tree | 840924da66a82b6a7dbeb66fe6a58f37a9f9b64f /include/ScopedJavaUnicodeString.h | |
| parent | 83d01084b9c729b9f1aece3ef225a60e2bd752fa (diff) | |
| parent | 94c85717985e7773c977cc55ec5c54572168fb20 (diff) | |
Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours skipped: 71fc6b75a3 skipped: 145f724ad4 skipped: f109dbf6d3 am: e70b1a0864 -s ours am: 84846dc7e4 -s ours" into oc-mr1-dev am: 94c8571798 -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: I122ad4b0b6b762445bef83c82b85b21c83c03088
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions