commit | 937cd87efc2bb35e603b378cd36722acbdd493ea | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 09:57:40 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:57:40 2023 +0000 |
tree | a856d40e9bc6893445261722d1eef9220061fa0e | |
parent | 945200c996516b2a4e6088689317ca032c73e643 [diff] | |
parent | 24f06dbfe1278dca58482f30d0df4789a2798f92 [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: c0270ea348 -s ours am: 76a44ca2a2 -s ours am: 24f06dbfe1 -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: I39f4da39b4f2ede823f7109511ecc1e169ab95b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>