commit | d7d60196d865ec56828539ec90d1af4dcd25b159 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:03 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:03 2020 +0000 |
tree | 9c12fa97a80d9cf5e773498eb11fd0e152fab486 | |
parent | 354a2513c0647ea8f3a96eaa0969c1ed20e9122f [diff] | |
parent | 4dd96fb41e79e924e1dfc1592a8f171ebc6ce0e8 [diff] |
[automerger skipped] Merge Android R am: 571649323d -s ours am: 73619f3a77 -s ours am: a9313df7f6 -s ours am: 4dd96fb41e -s ours am skip reason: Change-Id Id41e3ef8bd7d4487a754f33d25ff00e69633adc9 with SHA-1 737a78d493 is in history Original change: https://android-review.googlesource.com/c/platform/external/libutf/+/1422377 Change-Id: I11be26e5e4879bbdaf321c1d91d01b25f9574829