| commit | 68c232afaf808e3f0716a5a2876ab2532ead08c5 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Thu Apr 13 17:20:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 17:20:35 2017 +0000 |
| tree | 814851783db1fe4c25276e393c809640798d6de8 | |
| parent | c542de05f37d63eeed781850aceefa00494ee41b [diff] | |
| parent | 32d7be2f159c507c2c6854040faf8f796b9caabb [diff] |
Merge "Add android.hardware.nfc.any to NFC features." into oc-dev am: e7def4e9e0 am: 32d7be2f15 Change-Id: I62810eb6a2a7410f1113adcd4359d499ac8bd73d