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

author	Adrian Roos <roosa@google.com>
	Wed, 6 Aug 2014 01:46:55 +0000 (01:46 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 6 Aug 2014 01:46:55 +0000 (01:46 +0000)

* commit 'dac0890101d7b422a86fd98483d1dc69015b3943':
Ask about redacted notifications after setting up a secure lock

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help