OSDN Git Service

(root) / android-x86 / development.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36a3d06 e8b4ac2)
am e8b4ac2e: am aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
authorJeff Hamilton <jham@android.com>
Thu, 13 Jan 2011 20:48:30 +0000 (12:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jan 2011 20:48:30 +0000 (12:48 -0800)
* commit 'e8b4ac2e6d04cc4651c8b0852d8bcf02c4e5019a':
  Add a sample for the NFC foreground dispatch APIs.

1  2 
samples/ApiDemos/AndroidManifest.xml patch | diff1 | diff2 | blob | history

diff --cc samples/ApiDemos/AndroidManifest.xml
Simple merge
development
About OSDN
Find Software
Develop Software
Help