tree 1da20b0f2ff423bd3eafb25fdb758bcf3e0fe9d8
parent a37b2bb236486d5fc9158dbc66d1ff73a63c6e81
parent 11d210154d71a229e20eaebd6f9ea580b0c7f036
author Michael Runge <mrunge@google.com> 1415949598 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415949598 +0000

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

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