tree 30f8ff08b8a8db08ace3e1c5178166a84632b1bd
parent fc68d033e2005f7bf35d9fddded06f825e3ecfdd
parent e8980021869e89251c700a93193889453f7aee2f
author Martijn Coenen <maco@google.com> 1475144457 +0000
committer android-build-merger <android-build-merger@google.com> 1475144457 +0000

Merge "Default binderized implementation of android.hardware.nfc@1.0" am: a614ac0b88 am: b3bdadd0d0 am: 54e01deea2
am: e898002186

Change-Id: Id78eca98cc8a4f545d2aa5198076c6067a1b44b9