tree 9182d2f9304e15d2b0859570997b2e07edaaafa3
parent f8db421eeb4781f290df2e0d1001c73bf0ba4df3
parent b2222e2132013c5a6a76942227333fc005d7a525
author Martijn Coenen <maco@google.com> 1484297047 +0000
committer android-build-merger <android-build-merger@google.com> 1484297047 +0000

Merge "Load legacy NFC libhardware HAL by correct name." am: 9e172b30c7
am: b2222e2132

Change-Id: I4102013c5b43c471b9475156aae7bea88bf0bd53