Commits
Dan Sandler authored and Android Git Automerger committed 6e53d7ef755M
am 2f99ca32: am 90ac386b: Merge "Deal more gracefully with null smallIcons." into mnc-dev * commit '2f99ca32dbd29b3281b8464133f741c58f8ed05c': Deal more gracefully with null smallIcons.
Showing diff to255c90b4ee2