OSDN Git Service

am 5c61d17f: am 8f006edb: Prevent exception in production when icons collide during...
authorAdam Cohen <adamcohen@google.com>
Fri, 4 Apr 2014 01:57:48 +0000 (01:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Apr 2014 01:57:48 +0000 (01:57 +0000)
* commit '5c61d17f0ff67440ce9fb578043a4507b537aa0c':
  Prevent exception in production when icons collide during bind


Trivial merge