commit | 61a06660a5ffc72393327ff2ceceb8fb7ff78973 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 11:01:23 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 11:01:23 2023 +0000 |
tree | a856d40e9bc6893445261722d1eef9220061fa0e | |
parent | ebc5bb1a9d7e08e37699685775a94d212657ce7c [diff] | |
parent | 945200c996516b2a4e6088689317ca032c73e643 [diff] |
[automerger skipped] Merge Android 14 am: d9c12bb107 -s ours am: 6639974ed7 -s ours am: 33d93be089 -s ours am: 945200c996 -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: I7fe6730d16c108484d9fea673a2667ce20f5fcad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>