commit | db73ad2365980c302a703cd42c9033de538c3db2 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 29 08:17:03 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 08:17:03 2023 +0000 |
tree | 189448099ceb1b02016d7c2e5fd39cf9d089259f | |
parent | 63ef56cb89e4ba0fe6fd2af4559f323647ad738d [diff] | |
parent | 56191f9479c7b324c8bae6f3aad2be56590bf2dc [diff] |
[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: 0b047d730d -s ours am: 56191f9479 -s ours am skip reason: Merged-In Ib39ba935727df0bc1ab4030bcfe8301de7e64805 with SHA-1 82f3463d44 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24880287 Change-Id: I38dbb4aefa185712a8f5ace52a8a775616cd77fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>