OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b73eb2 583fe9d)
Merge "NFC: Allow HostApduService to indicate transaction unhandled." into klp-dev
authorMartijn Coenen <maco@google.com>
Mon, 19 Aug 2013 20:11:09 +0000 (20:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 19 Aug 2013 20:11:09 +0000 (20:11 +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