Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev am: daa1539a5e

author Esteban Talavera <etalavera@google.com>

Mon, 17 Jul 2017 16:34:29 +0000 (16:34 +0000)

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

Mon, 17 Jul 2017 16:34:29 +0000 (16:34 +0000)
author Esteban Talavera <etalavera@google.com>
Mon, 17 Jul 2017 16:34:29 +0000 (16:34 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 17 Jul 2017 16:34:29 +0000 (16:34 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
author	Esteban Talavera <etalavera@google.com>
	Mon, 17 Jul 2017 16:34:29 +0000 (16:34 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 17 Jul 2017 16:34:29 +0000 (16:34 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history