tree 2300610a482a13dab60f47797f6e279fda5e53e3
parent 0fd2877e2f3c01508ee63d3b5d3c74e6843d0675
parent 5c61d17f0ff67440ce9fb578043a4507b537aa0c
author Adam Cohen <adamcohen@google.com> 1396576668 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396576668 +0000

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

* commit '5c61d17f0ff67440ce9fb578043a4507b537aa0c':
  Prevent exception in production when icons collide during bind