tree 78080eb344f7dcc9babef25928a129f3fdbc8b49
parent a3f37c568d3b3f58483cfbee9b76dc96bddd749e
parent 5521f8e80c5a47b8a91cdefd48c1304044ef3c51
author Nicolas Geoffray <ngeoffray@google.com> 1415039102 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415039102 +0000

am 5521f8e8: am 71ed8c7e: Merge "Remove generated file if compiling the image failed."

* commit '5521f8e80c5a47b8a91cdefd48c1304044ef3c51':
  Remove generated file if compiling the image failed.