Merge "Tweaks to wireless charging animation" into pi-dev

author Beverly Tai <beverlyt@google.com>

Mon, 26 Mar 2018 13:22:07 +0000 (13:22 +0000)

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

Mon, 26 Mar 2018 13:22:07 +0000 (13:22 +0000)
author Beverly Tai <beverlyt@google.com>
Mon, 26 Mar 2018 13:22:07 +0000 (13:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 26 Mar 2018 13:22:07 +0000 (13:22 +0000)
diff --cc packages/SystemUI/res/values/dimens.xml
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
author	Beverly Tai <beverlyt@google.com>
	Mon, 26 Mar 2018 13:22:07 +0000 (13:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 26 Mar 2018 13:22:07 +0000 (13:22 +0000)
		1	2
packages/SystemUI/res/values/dimens.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history