tree 50067149824d90a549fda06ca58bc5c4859a2504
parent 964935b8a6ef52f090eb6f48875db5ebb32962cf
parent f178d36441c3a688cfe5eb41a5ce724ba01a4ecf
author Michael Runge <mrunge@google.com> 1415949442 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415949442 +0000

am f178d364: Merge "Allow images to be readded to target-files" into lmp-dev

* commit 'f178d36441c3a688cfe5eb41a5ce724ba01a4ecf':
  Allow images to be readded to target-files