Merge "Deprecate inKeyguardRestrictedInputMode"

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 6 Dec 2017 22:27:51 +0000 (22:27 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 6 Dec 2017 22:27:51 +0000 (22:27 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 6 Dec 2017 22:27:51 +0000 (22:27 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 6 Dec 2017 22:27:51 +0000 (22:27 +0000)
diff --cc api/current.txt
Simple merge
diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 6 Dec 2017 22:27:51 +0000 (22:27 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 6 Dec 2017 22:27:51 +0000 (22:27 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/policy/PhoneWindowManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history