Merge "Fix broken statusbar disable flags" into nyc-dev

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

Sat, 16 Apr 2016 00:53:20 +0000 (00:53 +0000)

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

Sat, 16 Apr 2016 00:53:22 +0000 (00:53 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Sat, 16 Apr 2016 00:53:20 +0000 (00:53 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 16 Apr 2016 00:53:22 +0000 (00:53 +0000)
diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge
diff --cc services/core/java/com/android/server/statusbar/StatusBarManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Sat, 16 Apr 2016 00:53:20 +0000 (00:53 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 16 Apr 2016 00:53:22 +0000 (00:53 +0000)
		1	2
services/core/java/com/android/server/policy/PhoneWindowManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/statusbar/StatusBarManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history