tree 186a510ce6d924ec1487b81475f05685b6552dd1
parent 816401601181be57636f1cbeb3626bfc24d42560
parent 5b6d3a356fa60fa2409a6cf475a95d49086b24bf
author Tom Cherry <tomcherry@google.com> 1540434379 -0700
committer android-build-merger <android-build-merger@google.com> 1540434379 -0700

Merge "Prepend vendor. to NFC HAL service name" am: ed30414351 am: ca586c46a6
am: 5b6d3a356f

Change-Id: I576f645caddf4902705dc343152c51d4529075be