commit | ff5bd3ee7fde2d16589029e299a33dc93d7f3c6d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:48 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:48 2020 +0000 |
tree | dda9c52d825e2868d9440c3bb89c5eb0c05f0e6e | |
parent | 695f4dd15264b1e944424e8c2b2dbbe816eb536b [diff] | |
parent | 3bad4b1cd99947a705eca6fb5b34d87a0b8e620b [diff] |
[automerger skipped] Merge Android R am: 90010e16e5 -s ours am: 0010a640a9 -s ours am: 3bad4b1cd9 -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: Ie098c5d0a315ac6158b144ae6d27f26e97101b4a