OSDN Git Service

am c58c549c: New UI for viewing and stopping currently running services.
authorDianne Hackborn <hackbod@google.com>
Tue, 1 Sep 2009 19:34:33 +0000 (12:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Sep 2009 19:34:33 +0000 (12:34 -0700)
Merge commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99' into eclair-plus-aosp

* commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99':
  New UI for viewing and stopping currently running services.

1  2 
AndroidManifest.xml
res/values/strings.xml

Simple merge
Simple merge