tree 9e4b6222ce9e867291e4283b62c4ce81c0421b9b
parent 97c48724a31b252c2b82ea0b4f1f8523e166b854
parent ac124b40cc816b24a82e2235df218556ba2b2cdd
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1561144476 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1561144476 +0000

Merge "[automerger skipped] Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev am: c65d4b728c -s ours am: 839b1659cd -s ours am skip reason: change_id Ia64238f30620d9906aa50c2469121c2653875e8d with SHA1 5dc581aef2 is in history" into qt-r1-dev-plus-aosp