Merge "Fixed that HUNs wouldn't show when the keyguard is occluded" into nyc-mr1-dev

author Selim Cinek <cinek@google.com>

Mon, 15 Aug 2016 18:35:57 +0000 (18:35 +0000)

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

Mon, 15 Aug 2016 18:35:59 +0000 (18:35 +0000)
author Selim Cinek <cinek@google.com>
Mon, 15 Aug 2016 18:35:57 +0000 (18:35 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 15 Aug 2016 18:35:59 +0000 (18:35 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
Simple merge
author	Selim Cinek <cinek@google.com>
	Mon, 15 Aug 2016 18:35:57 +0000 (18:35 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 15 Aug 2016 18:35:59 +0000 (18:35 +0000)