| commit | 496aaa484179385730fcfcca7dfc14c32829f648 | [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 | ed597b04e5d050acba318ad9075ea175b4929bdf | |
| parent | 13a5bc984e339fed2182c3d6f8f81f6fdcfdc774 [diff] | |
| parent | d5d66a2b562e9c644d8599ad73d54af0830580ad [diff] |
[automerger skipped] Merge "Merge Android 12" am: c03b0fa033 -s ours am: c259e66801 -s ours am: d5d66a2b56 -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