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

author	Daniel Sandler <dsandler@android.com>
	Thu, 22 Apr 2010 01:19:31 +0000 (18:19 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 22 Apr 2010 01:19:31 +0000 (18:19 -0700)

Merge commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1' into kraken

* commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1':
Labeled categories to help clarify Sound prefs.

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help