Merge "Fix jank when switching themes" into oc-dr1-dev

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

Tue, 25 Jul 2017 17:40:02 +0000 (17:40 +0000)

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

Tue, 25 Jul 2017 17:40:02 +0000 (17:40 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Tue, 25 Jul 2017 17:40:02 +0000 (17:40 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 25 Jul 2017 17:40:02 +0000 (17:40 +0000)
diff --cc packages/SystemUI/res/values/styles.xml
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Tue, 25 Jul 2017 17:40:02 +0000 (17:40 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 25 Jul 2017 17:40:02 +0000 (17:40 +0000)
		1	2
packages/SystemUI/res/values/styles.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history