OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5d9194 c9c5d57)
am c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
authorMartijn Coenen <maco@google.com>
Thu, 29 Aug 2013 19:57:33 +0000 (12:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Aug 2013 19:57:33 +0000 (12:57 -0700)
* commit 'c9c5d57e4e900573b8f8b65af4215cb45b48ce93':
  Add requireDeviceUnlock attribute for NFC HCE.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help