| commit | 9eb1ad80f04d668fb3a10f526dbd11de6c9a4ed2 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sun Dec 15 08:10:40 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Dec 15 08:10:40 2024 -0800 |
| tree | ad05f46765e0b1e92fb029e41f701f4c3f3789a5 | |
| parent | b1a1d49072650f8e9d87905175302f563d8c5d79 [diff] | |
| parent | d2894313d4dcbadcb43df1454177646cb6205a12 [diff] |
[automerger skipped] Merge 24Q4 into AOSP main am: 2cb09d0f60 -s ours am: d2894313d4 -s ours am skip reason: Merged-In I5ed05d0f5aa4c5e98fbd9b5275f3db39ccb76fed with SHA-1 28c21c69d6 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3368638 Change-Id: I7b78eb05fa13515f0c084a8836886b3b614749d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>