Merge "Re-create build directory if using existing one fails"
authorPyry Haulos <phaulos@google.com>
Mon, 13 Jul 2015 20:06:28 +0000 (20:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 13 Jul 2015 20:06:29 +0000 (20:06 +0000)

Trivial merge