| commit | 26163764e56e440e3d270b252f14e1cfec630eee | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Mar 09 10:02:57 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 10:02:57 2022 +0000 |
| tree | a92f6aaa43d95370ff77f6a6b9b113ea3899b487 | |
| parent | 7e965e32ce6f5ad9bfe538cb1a0720970187f49a [diff] | |
| parent | 3e022047837eb9b5b0e9f3ecd5bc58223110d6db [diff] |
[automerger skipped] Merge Android 12L am: 6cf59305f7 -s ours am: 4468f6b090 -s ours am: 3e02204783 -s ours am skip reason: Merged-In Ia1f142ead1f2c99cb45869fdc8576f4d232e5d23 with SHA-1 4a7ad1a1a8 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/2013326 Change-Id: Ic2ba1d4194e32a7f9293ceace6553fe635e8d220