commit | 33ea7c111bde550a7d3fb3a23e2d9292442e981e | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 00:40:16 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:40:16 2020 +0000 |
tree | a4b8afbef6137f0f0c5f188ba7b641ac5d11d0a7 | |
parent | a9f74e4c8f6d2884b50cc1afa8e5bf945b60edd7 [diff] | |
parent | efa54560d6f2fdd806cd5d7360bda2dc5e929b62 [diff] |
[automerger skipped] Merge Android R am: efa54560d6 -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: Ie2a1194ba0cb42bcce9fcbd2f44f99939c619687