| commit | a93b9bbccca070da6e4d491f4cd26bdc4fafa9c4 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 06 11:04:52 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 11:04:52 2023 +0000 |
| tree | 3c36644c7dc9781cd35bb2c0b7dcc44873ea630d | |
| parent | 0be52c83d67b60f5e9992e751c8140c5e78135bf [diff] | |
| parent | 4a35371df2039f182d7e050c933df3fe47c67a3f [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: 2d4c82a9b2 -s ours am: 3751616301 -s ours am: 71bdc9b9c0 -s ours am: 4a35371df2 -s ours am skip reason: Merged-In Iba64a513ed63fec30ce624db63aabc3fcea527d2 with SHA-1 99810e76d4 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/st/nfc/+/2776743 Change-Id: I4b5aacf540b1d3ba47a5b90cc0fdcae06494de51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>