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

author	Amith Yamasani <yamasani@google.com>
	Fri, 15 Jan 2010 01:04:45 +0000 (17:04 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 15 Jan 2010 01:04:45 +0000 (17:04 -0800)

Merge commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156' into eclair-plus-aosp

* commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156':
Strings for new Dock settings screen, to get started on the L10N.

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help