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

author	Zach Jang <zachjang@google.com>
	Thu, 17 Sep 2015 20:04:18 +0000 (20:04 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 17 Sep 2015 20:04:18 +0000 (20:04 +0000)

* commit '6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help