Merge changes I70f79400,I2f8cab37 into oc-dev am: bb790ca951

author Adrian Roos <roosa@google.com>

Wed, 5 Apr 2017 17:58:28 +0000 (17:58 +0000)

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

Wed, 5 Apr 2017 17:58:28 +0000 (17:58 +0000)
author Adrian Roos <roosa@google.com>
Wed, 5 Apr 2017 17:58:28 +0000 (17:58 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 5 Apr 2017 17:58:28 +0000 (17:58 +0000)
diff --cc core/res/res/values/attrs.xml
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
author	Adrian Roos <roosa@google.com>
	Wed, 5 Apr 2017 17:58:28 +0000 (17:58 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 5 Apr 2017 17:58:28 +0000 (17:58 +0000)
		1	2
core/res/res/values/attrs.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history