commit | 2ae3c09ddaa3cfc050822db5ab653850b66effed | [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 | 9bf4c026f812cb1d1d9896c6a6e3a7634edcca49 | |
parent | 3124399648508ca93e0b20f9b7ada77d5334f820 [diff] | |
parent | 301610b8c68fae7996e68f67d7d20e87bc3a59ae [diff] |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: d60cc74f32 -s ours am: 301610b8c6 -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