commit | 0313cff10b79ef02e6dc4f174d1b3d75dd56652c | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat Oct 07 00:27:02 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:27:02 2023 +0000 |
tree | a856d40e9bc6893445261722d1eef9220061fa0e | |
parent | d759c1819eee5438eb9bb141a37702ae928da8e8 [diff] | |
parent | b8fa819b96b9d11959bc9caeff2ad61920d21dba [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: b8fa819b96 -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: I7d451b172780ce0c0f34c7871425ae8b8517cd31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>