commit | 2edf2edd8db9914e9127ae587f4009e2f9e871a6 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat Sep 07 04:36:33 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 07 04:36:33 2024 +0000 |
tree | 87b5678a2fc7fd115fbeba9e16078cfc21581993 | |
parent | 056eabf1d721508c0c9cbdd8e92ed25ca831063b [diff] | |
parent | 46bf342e4f7250cd4fab5b4488d2b99f21189a14 [diff] |
[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 952d16a946 -s ours am: 46bf342e4f -s ours am skip reason: Merged-In Ic436003390c8feb4c5e9a36106abc1f7ab7f5a46 with SHA-1 077343adb6 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3258019 Change-Id: Iea1c66402525e37ef22ff7fd0f984e9597cfcdba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>