Merge "Fixed a flickering of the icon when it goes into the shelf" into pi-dev am...

author Selim Cinek <cinek@google.com>

Fri, 8 Jun 2018 23:13:18 +0000 (16:13 -0700)

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

Fri, 8 Jun 2018 23:13:18 +0000 (16:13 -0700)
author Selim Cinek <cinek@google.com>
Fri, 8 Jun 2018 23:13:18 +0000 (16:13 -0700)
committer android-build-merger <android-build-merger@google.com>
Fri, 8 Jun 2018 23:13:18 +0000 (16:13 -0700)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
Simple merge
author	Selim Cinek <cinek@google.com>
	Fri, 8 Jun 2018 23:13:18 +0000 (16:13 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 8 Jun 2018 23:13:18 +0000 (16:13 -0700)