OSDN Git Service

(root) / android-x86 / development.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9bb57b 7bd3646)
am 7bd36462: am c46a762e: am eb3547b3: Add API demo for services that run in the...
authorDianne Hackborn <hackbod@google.com>
Wed, 2 Dec 2009 01:34:28 +0000 (17:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 01:34:28 +0000 (17:34 -0800)
Merge commit '7bd364622b5204f46c9a7e4e9bc3692c755b7de4'

* commit '7bd364622b5204f46c9a7e4e9bc3692c755b7de4':
  Add API demo for services that run in the foreground.

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