tree 5e6e3893168b4adb6a848c56f86da8d7a6cb1655
parent e15cecc90cbe0b7ae39e524e612fb6043324bad8
parent 3936e7a6fb6ab5a3ee4bfa7e54786f0ee103d4bb
author Dan Sandler <dsandler@android.com> 1432130675 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1432130676 +0000

Merge "Deal more gracefully with null smallIcons." into mnc-dev