tree 264301d9cc06d087d2faa3f920e4f3958e2485e0
parent b84b1409efc0e2df28ff0969e10d33e40fc458f2
parent 80519db0409bd24fdd17146742c212d8b9a9a075
author Nick Kralevich <nnk@google.com> 1381523405 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381523405 -0700

am 80519db0: am 40dfc1d1: am 8fe7969d: am dc20ac98: improve the handling of images with duplicate component IDs

* commit '80519db0409bd24fdd17146742c212d8b9a9a075':
  improve the handling of images with duplicate component IDs