commit | b8fa819b96b9d11959bc9caeff2ad61920d21dba | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 11:07:29 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 11:07:29 2023 +0000 |
tree | a856d40e9bc6893445261722d1eef9220061fa0e | |
parent | 61a06660a5ffc72393327ff2ceceb8fb7ff78973 [diff] | |
parent | 937cd87efc2bb35e603b378cd36722acbdd493ea [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: c0270ea348 -s ours am: 76a44ca2a2 -s ours am: 24f06dbfe1 -s ours am: 937cd87efc -s ours am skip reason: Merged-In I6a736218a5df4d82338c86e6c43c39566ab38481 with SHA-1 80c5eaad25 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2777049 Change-Id: I1a5f4553bdf5d7d5205e45ad176c5c16a07b0d23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>