[automerger skipped] Merge "DO NOT MERGE: Fixed an issue about notification...
[automerger skipped] Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev am: c65d4b72 -s ours
am: 839b1659 -s ours
am skip reason: change_id Ia64238f30620d9906aa50c2469121c2653875e8d with SHA1 5dc581ae is in history
Change-Id: Ibda59f585a88a5d8cf2c72360a49f73b7160c6a2