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

author	Michael Jurka <mikejurka@google.com>
	Mon, 29 Oct 2012 20:41:52 +0000 (13:41 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 29 Oct 2012 20:41:52 +0000 (13:41 -0700)

* commit 'd4362b7d356f1f33e1752be68c149b1cd95d8463':
Adding ability to add multiple keyguard widgets

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help