commit a679d28c7e7cdefb805d89cbe7d18b8e3a301dad
author William Hesse <whesse@google.com> Tue Aug 18 13:17:07 2015 +0200
committer William Hesse <whesse@google.com> Tue Aug 18 13:17:07 2015 +0200
tree b6bd3c9d8e567e7af8fa8b68915e5b6437abf995
parent ec0f479bf65a9bc74b4560b618b2131eee9edd99
parent 5684fa64f8f3194ceda44981f6d31e5fc533fb78

Version 1.12.0-dev.5.5

Cherry-pick f9d05b6e299f96b67bcac32dc37ec6c28e937f55 to dev
Cherry-pick 7c06881680ee07274f4fb2dffafeb019bf882e0f to dev
Cherry-pick 57bf18c3f808df096fc4a3720228e321a0dd7c13 to dev
Cherry-pick 65834295d999484aa68a6bffefce2e235e03fb56 to dev
Cherry-pick fe05e7b90516fe2d853a65233a7258e8afb958c0 to dev
Cherry-pick f0b81a44bb801dc1fd0025a2b26073f4a5bad6a1 to dev
Cherry-pick 5abf4fef9ce23341af2b63edb98648ebe178a5da to dev
Cherry-pick 9fa9698caa8063ced35a352da8102a91bfad1299 to dev

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index 6c0f4ac..3cfbb85 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 12
 PATCH 0
 PRERELEASE 5
-PRERELEASE_PATCH 4
+PRERELEASE_PATCH 5