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

author	Svetoslav <svetoslavganov@google.com>
	Fri, 17 Oct 2014 21:28:41 +0000 (21:28 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 17 Oct 2014 21:28:41 +0000 (21:28 +0000)

* commit '8cfd94de1dcbe707f3747cc9515e4c3562f6b092':
User to confirm credentials if an accessibility service changes encryption.

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help