tree cbd637a2ec35b4df8d1f4aadb08e5d36a0344452
parent 6f1b7fb8079197d4a4edc5d2e5c5546302197f33
parent 8fe7969dd0b193bce2d25c9367c5f4ad1d9e8ff3
author Nick Kralevich <nnk@google.com> 1381522413 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381522413 -0700

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

* commit '8fe7969dd0b193bce2d25c9367c5f4ad1d9e8ff3':
  improve the handling of images with duplicate component IDs