commit 346f0529dfe58f7d4e54a1e6172e5a0cc46812c6
author William Hesse <whesse@google.com> Mon Sep 11 12:54:15 2017 +0200
committer William Hesse <whesse@google.com> Mon Sep 11 12:54:15 2017 +0200
tree ac4cfc21d7bcafde5ebd2a4b6a91a2b80f06b694
parent 8d96a3dc4371062ca432ffee76bdb19e6f673735
parent eff7b1d7e87a4cea1b7eeed3863c3b3e4e436611

Version 1.25.0-dev.16.3

Cherry-pick ef5c5533332d9044fdcb7848eb402bd313116d1e into dev

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index 75e9782..c9fa253 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 25
 PATCH 0
 PRERELEASE 16
-PRERELEASE_PATCH 2
+PRERELEASE_PATCH 3

tools/buildtools/update.py

diff --git a/tools/buildtools/update.py b/tools/buildtools/update.py
index 7f229de..8658059 100755
--- a/tools/buildtools/update.py
+++ b/tools/buildtools/update.py
@@ -95,7 +95,9 @@
     result = UpdateGNOnWindows()
     if result != 0:
       return result
-    return UpdateClangFormatOnWindows()
+    # TODO(zra): Re-enable clang-format download when gs is fixed for the bots.
+    # return UpdateClangFormatOnWindows()
+    return 0
   if Update() != 0:
     return 1
   return CopyClangFormat()