| commit | 2803998e283cd554637ab5d8c64bb06f42eb72f5 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Mar 07 10:50:25 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 07 10:50:25 2024 +0000 |
| tree | 3809aca136068cefc160a955b514c73b6b376426 | |
| parent | 393fbb9f9407847b503e69c2bcb8a243eb3ced9a [diff] | |
| parent | 0f2124b5fb19281d361fe89e110d1d60cb930d37 [diff] |
[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 17be590463 -s ours am: 0f2124b5fb -s ours am skip reason: Merged-In I07e275dfff55380efa7aa2908937b087a151d9ae with SHA-1 760f097b61 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2989703 Change-Id: Ib00825958cffd093c57d0391adbf6a2d7f9117a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>