tree df627a858cd75958261f7b79c979ec41f0c94bb3
parent 7e70be1060ed0c16f48d1fd6a4aa8dcef2e41f34
parent dc20ac98d48382a8e0eaafd15c38a57f8ca836c9
author Nick Kralevich <nnk@google.com> 1381521976 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381521976 -0700

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

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