tree fe754e927b148a9a6bd956c5cbd3219b5f608890
parent 582d23462e38c52092dffe02610ea86a6dca4789
parent 2128ea3e1d30ba0b4ef0938a02b9253bf75168a7
author Will Drewry <drewry@google.com> 1495139924 +0000
committer android-build-merger <android-build-merger@google.com> 1495139924 +0000

Merge "third_party/nxp: use /data/vendor/ese not /data/nfc"
am: 2128ea3e1d

Change-Id: I13364a7f25adeaafe3c6adc2ce8df09738b0f313