| commit | 1dc19be93913bfc14850870d1e1bd26764bc72dc | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:04 2020 +0000 |
| tree | 4b4bb07ae5d7c8bd613c32092438dc02bc117ec4 | |
| parent | 59e7259b285d251e1c6e1f1da1fcd5997c331369 [diff] | |
| parent | d82943690056227babe71e6b11a9c13f6ac73955 [diff] |
[automerger skipped] Merge Android R am: efa54560d6 -s ours am: 33ea7c111b -s ours am: cd9bc9bb59 -s ours am: d829436900 -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: I82d4aff88861d34703b672b9db62cb652ea95550