OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4dac7a8 ecfb0ff)
am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into...
authorJeff Hamilton <jham@android.com>
Fri, 22 Oct 2010 19:11:23 +0000 (12:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Oct 2010 19:11:23 +0000 (12:11 -0700)

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