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

author	Jim Miller <jaggies@google.com>
	Sat, 18 Oct 2014 02:20:59 +0000 (02:20 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Sat, 18 Oct 2014 02:20:59 +0000 (02:20 +0000)

* commit '456b866c09f88d4fd15c9650d2ee882be9dca8ec':
Fix bad string in EncryptionInterstitial

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help