commit 3cb1f9dcd14cc8cb95e3d92bef0b39c24c91d552
author William Hesse <whesse@google.com> Wed Dec 07 15:33:32 2016 +0100
committer William Hesse <whesse@google.com> Wed Dec 07 15:33:32 2016 +0100
tree 92e41a4972dba6be82ea91bf9e68cb0bf4f71991
parent b40c20bfbccd0e4d98d194b9d362d04a9f7c91f3
parent 15400c01f06ddb8536afea6b5dad5099973e1aa3

Version 1.21.0

Merge 15400c01f06ddb8536afea6b5dad5099973e1aa3 into stable

CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b90703a..141f621 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.21.0
+## 1.21.0 - 2016-12-07
 
 ### Language
 

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index 392d057..fef80b6 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -24,9 +24,9 @@
 #  * Making cherry-picks to stable channel
 #     - increase PATCH by 1
 #
-CHANNEL dev
+CHANNEL stable
 MAJOR 1
 MINOR 21
 PATCH 0
-PRERELEASE 11
-PRERELEASE_PATCH 3
+PRERELEASE 0
+PRERELEASE_PATCH 0