tree 6ac47932ac33a74dc793fba157e45b343c57d3ef
parent 793bca0795b146be057c4aa1d02c1e236b37eb34
parent c2bbdf0bde91cf77f9f284b517c8c0fdea6436f1
author Selim Cinek <cinek@google.com> 1564443500 -0700
committer android-build-merger <android-build-merger@google.com> 1564443500 -0700

[automerger skipped] Merge "Showing the notification icon properly now when the pulse is suppressed" into qt-dev am: bb94263ca2 am: b6bb219d9e -s ours
am: c2bbdf0bde -s ours
am skip reason: change_id I8f7bd7a6a0562942ed3e12f28705043722d177e8 with SHA1 65c96f2fd4 is in history

Change-Id: Icffab0cba71a00e4829354390f89b72f81faa01e