OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7d5866 20fd8e7)
am 48c698fc: Adding NFC sample resources (DO NOT MERGE)
authorMegha Joshi <mjoshi@google.com>
Sat, 13 Nov 2010 02:46:38 +0000 (18:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 13 Nov 2010 02:46:38 +0000 (18:46 -0800)
* commit '48c698fc1497a01743f9ce5ab6fb8f6700847259':
  Adding NFC sample resources (DO NOT MERGE)


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