tree 2300610a482a13dab60f47797f6e279fda5e53e3
parent dc1f5c4dcb39146320a692606a7371d130afbfe7
parent 8f006edba228622422088a358aafee069e1d9cfb
author Adam Cohen <adamcohen@google.com> 1396576347 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396576347 +0000

am 8f006edb: Prevent exception in production when icons collide during bind

* commit '8f006edba228622422088a358aafee069e1d9cfb':
  Prevent exception in production when icons collide during bind