OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4d3fc0b e17fce6)
am 25900c0a: am 82e2dd54: am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to...
authorEsteban Talavera <etalavera@google.com>
Thu, 21 Aug 2014 15:31:58 +0000 (15:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Aug 2014 15:31:58 +0000 (15:31 +0000)
commitfc3487fe496651544d928eefcd817eacabb9a225
tree6c64d3b1633ef8078c13db4680b8b80d4f151c9btree | snapshot
parent4d3fc0b8288fbc39671ed195bc6cf538b81a0988commit | diff
parente17fce679a023f8a653f3268d6a960b8e61abefecommit | diff
am 25900c0a: am 82e2dd54: am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev

* commit '25900c0a347ae6d79efc0a96b06cf6933bd7c741':
  Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
api/current.txt diff1 | diff2 | blob | history
core/java/android/app/admin/DevicePolicyManager.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help