OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7d515a df4d1d6)
Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
authorMartijn Coenen <maco@google.com>
Thu, 29 Aug 2013 19:56:00 +0000 (19:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 29 Aug 2013 19:56:01 +0000 (19:56 +0000)
1  2 
api/current.txt patch | diff1 | diff2 | blob | history

diff --cc api/current.txt
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help