commit c854bfae2176b87aa9839f46f9457dbb62b548e2
author William Hesse <whesse@google.com> Wed Jul 08 12:19:36 2015 +0200
committer William Hesse <whesse@google.com> Wed Jul 08 12:19:36 2015 +0200
tree 32b5fd5945b90ca7b465ac9bb3390b1459be7c98
parent 6c59807647deac9a81780a304002b751ca2ea549
parent 6de1083784d8a73e234dd14cabd17e7ee5852949

Version 1.12.0-dev.2.1

Merge commit '6de1083784d8a73e234dd14cabd17e7ee5852949' into dev

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index 0d220d1..0e38057 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 12
 PATCH 0
 PRERELEASE 2
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1

tools/clean_output_directory.py

diff --git a/tools/clean_output_directory.py b/tools/clean_output_directory.py
index e41671c..79df929 100755
--- a/tools/clean_output_directory.py
+++ b/tools/clean_output_directory.py
@@ -7,6 +7,7 @@
 
 import shutil
 import sys
+import subprocess
 import utils
 
 def Main():