Merge "Fix wifi tile animating full-dark when slashing/unslashing" into oc-mr1-dev

author Evan Laird <evanlaird@google.com>

Tue, 26 Sep 2017 14:09:09 +0000 (14:09 +0000)

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

Tue, 26 Sep 2017 14:09:09 +0000 (14:09 +0000)
author Evan Laird <evanlaird@google.com>
Tue, 26 Sep 2017 14:09:09 +0000 (14:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 26 Sep 2017 14:09:09 +0000 (14:09 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/qs/tileimpl/SlashImageView.java
Simple merge
author	Evan Laird <evanlaird@google.com>
	Tue, 26 Sep 2017 14:09:09 +0000 (14:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 26 Sep 2017 14:09:09 +0000 (14:09 +0000)