| commit | 3989cc2ce98c50938f986dc3deb24c68aa09242c | [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 | 36abaf22d7a4dd2e19170c04937cd6d86ac1110b [diff] | |
| parent | 4d822580412b3cca72a76435c7f6ab6d8c56f763 [diff] |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 490ecdadb4 -s ours am: 4d82258041 -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