commit | d759c1819eee5438eb9bb141a37702ae928da8e8 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat Oct 07 00:20:53 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:20:53 2023 +0000 |
tree | a856d40e9bc6893445261722d1eef9220061fa0e | |
parent | a7aefe7887bfb90621306ae9ec4b189595c3641f [diff] | |
parent | 61a06660a5ffc72393327ff2ceceb8fb7ff78973 [diff] |
[automerger skipped] Merge Android 14 am: d9c12bb107 -s ours am: 6639974ed7 -s ours am: 33d93be089 -s ours am: 945200c996 -s ours am: 61a06660a5 -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: Icec4b58e4aa9581852eb21273fbf22548b840990 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>