commit 58c696737dc0434a848d3c4bbd3a859b42a42871
author William Hesse <whesse@google.com> Wed Jul 08 13:46:00 2015 +0200
committer William Hesse <whesse@google.com> Wed Jul 08 13:46:00 2015 +0200
tree 828a2f33f242053284ab6166705f5ed9cad2ab0d
parent c854bfae2176b87aa9839f46f9457dbb62b548e2
parent 431cbae68736e8cc2d80163628cf7da21f131bb6

Version 1.12.0-dev.2.2

Cherry-pick 029d5c9f85dedbe8d1b4d41a8cb27d70652c9c1b to dev

tools/VERSION

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

tools/clean_output_directory.py

diff --git a/tools/clean_output_directory.py b/tools/clean_output_directory.py
index 79df929..f0f0426 100755
--- a/tools/clean_output_directory.py
+++ b/tools/clean_output_directory.py
@@ -5,6 +5,7 @@
 # BSD-style license that can be found in the LICENSE file.
 #
 
+import os
 import shutil
 import sys
 import subprocess