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

author	Michael Chan <mchan@android.com>
	Thu, 17 Dec 2009 21:09:14 +0000 (13:09 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 17 Dec 2009 21:09:14 +0000 (13:09 -0800)

Merge commit '5147794329ee6a6b503ce13dff3dc0a50a355c6d'

* commit '5147794329ee6a6b503ce13dff3dc0a50a355c6d':
b/2334482 Dock string changed to Music, ringer, alarms (silences phone)

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help