commit | 49ceda904aca3826c11a951fc8c894688ba307c3 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Mar 03 23:37:15 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 23:37:15 2021 +0000 |
tree | 4f80fc6f222cdeb854a49b1eed2f9330f86caaa0 | |
parent | 1881ec9386a11993784939e89a1a562850591a1f [diff] | |
parent | 065dbb1c6bf598583bed45090d6d1cc14a22c3ea [diff] |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 1af6a12e98 -s ours am: 065dbb1c6b -s ours am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613627 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4f023fd4fe72b6254cf51af02ca8bd5967e49549