Change screen pinning back to old gesture

author Jorim Jaggi <jjaggi@google.com>

Wed, 28 Dec 2016 17:12:28 +0000 (17:12 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 28 Dec 2016 17:12:28 +0000 (17:12 +0000)
author Jorim Jaggi <jjaggi@google.com>
Wed, 28 Dec 2016 17:12:28 +0000 (17:12 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 28 Dec 2016 17:12:28 +0000 (17:12 +0000)
diff --cc packages/SystemUI/res/values/strings.xml
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge
author	Jorim Jaggi <jjaggi@google.com>
	Wed, 28 Dec 2016 17:12:28 +0000 (17:12 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 28 Dec 2016 17:12:28 +0000 (17:12 +0000)
		1	2
packages/SystemUI/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history