commit | ccb88c2c55e0aa0cd04a5b5cf0044ac096a8b4a2 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Aug 29 20:37:37 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 29 20:37:37 2023 +0000 |
tree | 40a57e0db0b04e7c16207e18d600154ad85c02f5 | |
parent | 711ab9b2b1a58a74b5d54eec9817db2690e8cf03 [diff] | |
parent | 448676d45eed4255f0287cc4f15a850b8a530298 [diff] |
[automerger skipped] Merge Android U (ab/10368041) am: 25004e48fc -s ours am: bc791fd863 -s ours am: 74283a5283 -s ours am: 448676d45e -s ours am skip reason: Merged-In I685a21fe69e84db3a8fc0605a121f5f48c2ab5cd with SHA-1 819c58515a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/st/nfc/+/24182805 Change-Id: I56434d631bc930f525390a32f1a9fa7c1853cb6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>