Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev am: 6a6d63be45

author Lucas Dupin <dupin@google.com>

Thu, 13 Jul 2017 19:57:40 +0000 (19:57 +0000)

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

Thu, 13 Jul 2017 19:57:40 +0000 (19:57 +0000)
author Lucas Dupin <dupin@google.com>
Thu, 13 Jul 2017 19:57:40 +0000 (19:57 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 13 Jul 2017 19:57:40 +0000 (19:57 +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	Lucas Dupin <dupin@google.com>
	Thu, 13 Jul 2017 19:57:40 +0000 (19:57 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 13 Jul 2017 19:57:40 +0000 (19:57 +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