am 9ebb030a: am e5129d7f: Merge "Defer adding large icon until when we compose...
am 9ebb030a: am e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1
* commit '9ebb030a':
Defer adding large icon until when we compose the final notification. (Bug 5566846)