| commit | 1ad2cfce7ffe0f6f285d9995f7ed0cd3cf10b425 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:19 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:19 2020 +0000 |
| tree | dda9c52d825e2868d9440c3bb89c5eb0c05f0e6e | |
| parent | 22e2ae74d72c743770865c78f422dae9e243ec47 [diff] | |
| parent | ff5bd3ee7fde2d16589029e299a33dc93d7f3c6d [diff] |
[automerger skipped] Merge Android R am: 90010e16e5 -s ours am: 0010a640a9 -s ours am: 3bad4b1cd9 -s ours am: ff5bd3ee7f -s ours am skip reason: Change-Id I8bc0155abf6af90ce9f82e7d01647193e9442b55 with SHA-1 2506fb1492 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/1421760 Change-Id: I960bb3f9f5362f05da2ce08e78635b4a9b72b545