tree 6b297eb744f4c2a93df22313cb4940329cdb3e73
parent 14d8fa0373cc75eea1bd8413b7757b918a4ff3c7
parent 40dfc1d1a9742d1ea7452fd0d08765d5b595e813
author Nick Kralevich <nnk@google.com> 1381523210 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381523210 -0700

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

* commit '40dfc1d1a9742d1ea7452fd0d08765d5b595e813':
  improve the handling of images with duplicate component IDs