git.osdn.net Git - android-x86/packages-apps-Settings.git/commitdiff

author	Dianne Hackborn <hackbod@google.com>
	Wed, 30 Sep 2009 01:15:38 +0000 (18:15 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 30 Sep 2009 01:15:38 +0000 (18:15 -0700)

Merge commit 'cabb147ce57bdcbb6baa08686415ce03f97028d7' into eclair-plus-aosp

* commit 'cabb147ce57bdcbb6baa08686415ce03f97028d7':
Improve running services info.

		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help