commit | 8428387f3a685ba7bb28e580b22ab860715b1d97 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Dec 08 08:51:53 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 08 08:51:53 2023 +0000 |
tree | e70601aa498aadb5ea02d3ab6130b4203c277aae | |
parent | 736bb1b26325205e5cc274998650a454a34c7520 [diff] | |
parent | 15cd320cf9aa1aee2655671f1d7ca4e38dd31537 [diff] |
[automerger skipped] Merge "Merge UQ1A.231205.015" into aosp-main-future am: 490e264eed -s ours am: 15cd320cf9 -s ours am skip reason: Merged-In I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf with SHA-1 c793afe3bd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25590347 Change-Id: I4bb219d846aed73537e2460a345b6d19a5cd13f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>