OSDN Git Service

Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev
authorEsteban Talavera <etalavera@google.com>
Thu, 21 Aug 2014 14:58:17 +0000 (14:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Aug 2014 14:58:18 +0000 (14:58 +0000)
commit2df7d1ef51ebff5228e0cbd7e15a34fce7307390
tree5dcb9af2407b8cd3fa4d690f2d53aa319700df10
parent20303426ac8476f33fbb1a0b99dad6aa59e6bb32
parentf057f06631e32471cd1ce8f34222251c0537a406
Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev
api/current.txt
core/java/android/app/admin/DevicePolicyManager.java