| commit | 936edfacd3666dde9b4055d552116a441ee43e5f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 14 21:00:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 21:00:19 2021 +0000 |
| tree | 885a15b460e2a5f1e5c989e5dbd630d8b02a39e2 | |
| parent | 76187327f6a110445db07c2e2a03cd2fcf1bbbfc [diff] | |
| parent | 78129f3c2e1bcaaae5c76d79fe28f1c44f5851e3 [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: 78129f3c2e -s ours am skip reason: Merged-In Ibcfed4617dcaea3b81e5d3a3eb68e6494488c7f7 with SHA-1 655d7f9857 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921235 Change-Id: Ia8ea1d733eb1f24f0deb248a76c5f135cd63b3e5