| commit | 0f2124b5fb19281d361fe89e110d1d60cb930d37 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Mar 07 09:59:01 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 07 09:59:01 2024 +0000 |
| tree | dff0d0607a9a00ac911d8aad032b0b0bdda6a2f7 | |
| parent | 7e16bd23fa5c09a8e8c44a2a3c9108dae441e6f9 [diff] | |
| parent | 17be5904632549811273880cfc224c9ae5ab02ff [diff] |
[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 17be590463 -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: I5c4fe6aedf67623f81ab4b4ee18d75573a9c750b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>