Merge "SystemUI: fix notification redaction logic." into oc-dev am: 5f3cab514b

author Charles He <qiurui@google.com>

Thu, 1 Jun 2017 08:16:29 +0000 (08:16 +0000)

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

Thu, 1 Jun 2017 08:16:29 +0000 (08:16 +0000)
author Charles He <qiurui@google.com>
Thu, 1 Jun 2017 08:16:29 +0000 (08:16 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 1 Jun 2017 08:16:29 +0000 (08:16 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
author	Charles He <qiurui@google.com>
	Thu, 1 Jun 2017 08:16:29 +0000 (08:16 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 1 Jun 2017 08:16:29 +0000 (08:16 +0000)