| commit | 1c1be36080f6fe3de21f475760b9a0afc3f5153a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:43 2021 +0000 |
| tree | cc16f70b04b7b1fdc189108fe9dbb87f218e74fa | |
| parent | 1877501865ff3f34cbbc158aeba4ee65549f4ebb [diff] | |
| parent | 21ae3681668e1c480101ffedbbcc6fd03a7e238c [diff] |
[automerger skipped] Merge Android 12 am: af8e35e56c -s ours am: 1c50a6f2c6 -s ours am: 21ae368166 -s ours am skip reason: Merged-In Ib5136d6b1d938fdfdd7789ee8c45834b44ed33d3 with SHA-1 f98900a93d is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1847606 Change-Id: I35d94cbbc9644ab9e00eeb04b7b6275e77b608a9