| commit | cd9bc9bb5953c9317689979957fdc9b80bc42b64 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:43 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:43 2020 +0000 |
| tree | a4b8afbef6137f0f0c5f188ba7b641ac5d11d0a7 | |
| parent | df442f60fee19412405ca9e4fd852a0956d1b79a [diff] | |
| parent | 33ea7c111bde550a7d3fb3a23e2d9292442e981e [diff] |
[automerger skipped] Merge Android R am: efa54560d6 -s ours am: 33ea7c111b -s ours am skip reason: Change-Id I6c989df8c8bcfbac6c5d1c14d2876de20192759b with SHA-1 a9f74e4c8f is in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1421780 Change-Id: I8d575c7df82c14b70821b62a1a59a89cc8d3c697