| commit | 36d0ed5847c9f50199eec7e664d63cb455645a16 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Dec 11 21:20:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 21:20:33 2023 +0000 |
| tree | 4e2a805c7ef8730648539b2a534b801a7a0d96d8 | |
| parent | 6667129917e93a4633ef4f65f7839abcc8f4641a [diff] | |
| parent | 7fd8fcb360a430138aa34a8b38b0a99039462ff1 [diff] |
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 7fd8fcb360 -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: Icf4970368290524ece7406f3c735b70f9703ebaf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>