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