| commit | 7de7765afeec1a5f3215fdeaa337365ab500f23f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 29 10:21:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 10:21:13 2023 +0000 |
| tree | a15634b90dd4c6e6e5297597c1aec894c8e0d09d | |
| parent | 268738e3b7c09dcfa191eb1cf35af5b839b38439 [diff] | |
| parent | 623a79997033daae75c0137913474327e6647c6c [diff] |
[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: ee8af04392 -s ours am: 81dd77b90e -s ours am: d0b7962c78 -s ours am: 623a799970 -s ours am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60ff7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24879326 Change-Id: I1c4d4e3235fbd9aaed0ce92b6225f2d1121debb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>