tree 1a6275c3ef07b860160466c198d934d09c64cacf
parent ae53918e5111f0940b6445ad42d9b1d178ef2fc7
parent 161a7d91069ee940becd1589e3e9f95802cab4ec
author Pyry Haulos <phaulos@google.com> 1436818419 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436818419 +0000

am 161a7d91: Merge "Re-create build directory if using existing one fails"

* commit '161a7d91069ee940becd1589e3e9f95802cab4ec':
  Re-create build directory if using existing one fails