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

author	Jim Miller <jaggies@google.com>
	Thu, 24 Jul 2014 19:59:52 +0000 (19:59 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 24 Jul 2014 19:59:52 +0000 (19:59 +0000)

* commit 'ab2b852cee8a178097b34d42d5482fecd638414f':
Change wording in keyguard settings menu.

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help