commit | d82943690056227babe71e6b11a9c13f6ac73955 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:34 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:34 2020 +0000 |
tree | a4b8afbef6137f0f0c5f188ba7b641ac5d11d0a7 | |
parent | 32b812aebba4e8431667e838aea988624de16fb3 [diff] | |
parent | cd9bc9bb5953c9317689979957fdc9b80bc42b64 [diff] |
[automerger skipped] Merge Android R am: efa54560d6 -s ours am: 33ea7c111b -s ours am: cd9bc9bb59 -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: I647d5e8a08572851d2a9a3e944037f3635941627