Merge "Follow up CL for heads up notification refactoring" into mnc-dev

author Selim Cinek <cinek@google.com>

Tue, 28 Apr 2015 23:27:56 +0000 (23:27 +0000)

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

Tue, 28 Apr 2015 23:27:58 +0000 (23:27 +0000)
author Selim Cinek <cinek@google.com>
Tue, 28 Apr 2015 23:27:56 +0000 (23:27 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 28 Apr 2015 23:27:58 +0000 (23:27 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
Simple merge
author	Selim Cinek <cinek@google.com>
	Tue, 28 Apr 2015 23:27:56 +0000 (23:27 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 28 Apr 2015 23:27:58 +0000 (23:27 +0000)