OSDN Git Service

(root) / android-x86 / development.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2ddf90 7a11acd)
am 7a11acd9: am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
authorJeff Hamilton <jham@android.com>
Tue, 25 Jan 2011 22:44:37 +0000 (14:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Jan 2011 22:44:37 +0000 (14:44 -0800)
* commit '7a11acd92bec5e7a089bdb248a78589491962c76':
  Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.

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