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

author	Amith Yamasani <yamasani@google.com>
	Tue, 24 Jul 2012 01:49:45 +0000 (18:49 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 24 Jul 2012 01:49:45 +0000 (18:49 -0700)

* commit '4635ec6b8dcf9a9f686a4d25eaffe916f5dcd20e':
Strings for upcoming location settings changes.

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help