| commit | e4d18ce07a3b554e35a3b6531ae6f01d909a7f27 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:37 2021 +0000 |
| tree | 63cd9a8ef0521c47ea1359c260febd5452bb2654 | |
| parent | 6abf3e770acab09470f856fe047b5d7ffbe2dab0 [diff] | |
| parent | b2944cf8e238daad4da988a4b5b8ea1d8f0ec48f [diff] |
[automerger skipped] Merge "Merge Android 12" am: ac52fef735 -s ours am: d3f545598b -s ours am: b2944cf8e2 -s ours am skip reason: Merged-In Iba1443da42161f4a41830081f2e1985b30444cc0 with SHA-1 ee05ff24d8 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1847122 Change-Id: I25a7ef9d68d597dae37704c4b0f4e36b5e34478e