Version 2.3.1-dev.0.0

Merge commit '5b63d74608e64109d8ffbedb33930e7c4725f339' into dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5184896..e2243c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,9 @@
-## 2.3.0-dev.XX.0
-(Add new changes here, and they will be copied to the change section for the
- next dev version)
+## 2.3.1-dev.0.0
 
 ### Core library changes
 
 #### `dart:async`
-* BREAKING CHANGE: 
+* BREAKING CHANGE:
   Fixes bug in `StreamIterator` which allowed constructor argument to be `null`.
   Also allowed `await for` on a `null` stream. This is now a runtime error.
 
@@ -37,7 +35,7 @@
 * BREAKING CHANGE: The `await for` allowed `null` as a stream due to a bug
   in `StreamIterator` class. This bug has now been fixed.
 
-## 2.3.0
+## 2.3.0 - 2019-05-08
 
 The focus in this release is on the new "UI-as-code" language features which
 make collections more expressive and declarative.
diff --git a/tools/VERSION b/tools/VERSION
index 6ff55cc..9bf1a57 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -29,10 +29,10 @@
 #  * Deprecating an old ABI version:
 #     - increase OLDEST_SUPPORTED_ABI_VERSION to the version that is supported.
 #
-CHANNEL be
+CHANNEL dev
 MAJOR 2
 MINOR 3
-PATCH 0
+PATCH 1
 PRERELEASE 0
 PRERELEASE_PATCH 0
 ABI_VERSION 4