tree 5f39dbe0a6f05c15ce07803b101e26a40e4303ca
parent 0061f897d4f6217475bbb4bb63fcbd7f8f4af3e5
parent f7e17efa07f55cf64199942e488cba7d8b2d5b13
author Nick Kralevich <nnk@google.com> 1381523875 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381523875 -0700

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

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