tree 277457de9eddffc7381433afca6ba3d7da6addda
parent 207cb2edb6f228d18c4eef874108ba5af36b2136
parent f9738f6cf3e0b0aa4c09f47a30fd03b65b035888
author Selim Cinek <cinek@google.com> 1566351111 -0700
committer android-build-merger <android-build-merger@google.com> 1566351111 -0700

Merge "[automerger skipped] Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev am: cceea08cc7 -s ours am: 776d0367b0 -s ours am: 3518b5caef -s ours
am: f9738f6cf3 -s ours
am skip reason: subject contains skip directive

Change-Id: I4d29289efc123bc93c3bb2a54fbc0364a18977bf