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