tree 4a1e0e0ae0110f1a0f5aa9ea62aef55f8495155a
parent dc87165eb58d7f0229331ffa18c097cf84b1923e
parent e18608d04732f1b1a6c3cd5a344520b870b3a5da
author Martijn Coenen <maco@google.com> 1492102398 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1492102402 +0000

Merge "Add android.hardware.nfc.any to NFC features." into oc-dev