| commit | e8d1c5b943d6097dd5f8bdedbf3c430ca8d0f0db | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Dec 11 23:01:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 23:01:54 2023 +0000 |
| tree | 0c085ed00226afe3504e60725ff7fd3f18e7771e | |
| parent | 66a4730df5ab2c1b22947d9cfe1f6a73825c72e1 [diff] | |
| parent | ec49ce94ea65312b104800187e0045a97c90ed17 [diff] |
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 7fd8fcb360 -s ours am: 36d0ed5847 -s ours am: ec49ce94ea -s ours am skip reason: Merged-In I05a5865b2ee13be65e16a8a0bcdc58fc33e4d461 with SHA-1 249f348c59 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2865780 Change-Id: Ib16c231e7e51148db3401943095e13aca08a8c53 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>