OSDN Git Service

Merge "Implementation of HCE for NFC-F."
authorMartijn Coenen <maco@google.com>
Mon, 25 Jan 2016 09:48:43 +0000 (09:48 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 25 Jan 2016 09:48:43 +0000 (09:48 +0000)
commite168012ff21408f8be85040bb4ac977061519f62
tree13e71577cf7eb2986e3759887a3e26ebed662fbc
parentb7fbe1104fd93b426dd6a6f2ed9dfc9cb12b4dd8
parentc52adfe12469a1d1bcd5b7119b83363e094a7b84
Merge "Implementation of HCE for NFC-F."
Android.mk
api/current.txt
api/system-current.txt
core/java/android/nfc/NfcAdapter.java