commit | 9e2b0c46fe34040124bcb879fe1cc38eb110446c | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Mar 03 22:29:22 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 22:29:22 2021 +0000 |
tree | 2396ce25b3210d64041833939308c84ec0ad73d0 | |
parent | 96938a781596a8a5efb3da9e4270c77ea83706b3 [diff] | |
parent | e616910155313e20013a15e5d322b1ca37cc9f2e [diff] |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: e616910155 -s ours am skip reason: Change-Id I2f7cee6cdae4b16c5adeb7af751a591a939948e2 with SHA-1 e00110e131 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1613628 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iab297d9ca4835281e55702d5a0d0c209508f952d