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

author	Svetoslav <svetoslavganov@google.com>
	Thu, 2 Oct 2014 12:47:33 +0000 (12:47 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 2 Oct 2014 12:47:33 +0000 (12:47 +0000)

* commit '4b2fc1adad9e27b9a78732a87678297834f82e9c':
Use default encryption password if an accessibility service is enabled.

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help