OSDN Git Service

Merge "decouple HCE from FEATURE_NFC" into nyc-mr1-dev
authorSteve Elliott <steell@google.com>
Tue, 10 May 2016 19:54:43 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 19:54:43 +0000 (19:54 +0000)
am: b8eb2c5608

* commit 'b8eb2c5608b782d9bfc4a65625c353d79188a680':
  decouple HCE from FEATURE_NFC

Change-Id: If99fea76a8713bb4f77ffe38523501efc34b0882


Trivial merge