commit 95919cec650e9bf80b6f6099a0a2308fd0dd271f
author Alexander Thomas <athom@google.com> Tue Jul 31 14:57:26 2018 +0200
committer Alexander Thomas <athom@google.com> Tue Jul 31 15:05:14 2018 +0200
tree b8d613826cb028b6ae13a78026844a01892797fa
parent 1e60cc168be2e1788c8acd5055ff996c10f2d99f
parent 0893e20c7eb542d50b1793acdb9919146e1a6722

Version 2.0.0-dev.69.5

 * Cherry-pick cb70de8afaf72ffccc2cb296960d3ed755979167 to dev
 * Cherry-pick 4482d13ff75dadc68df64758a35976c5cbeadbc6 to dev
 * Cherry-pick 5a45b2a62b3d647b7b4feca78da5948b5d108573 to dev
 * Cherry-pick 24158b773d29d36305ce6e8dbc1a1ce24a54e58e to dev
 * Cherry-pick 68bfaf3ac349e78cf5a7ea78d48e0b51bae2e605 to dev
 * Cherry-pick 23ba527735b386371395cd06c4cf39381072fc89 to dev
 * Cherry-pick 72960de5f9a8bc36c7a6265d56c6643d93c512b5 to dev

CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cca1d02..8701a43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 2.0.0-dev.69.5
+* Cherry-pick cb70de8afaf72ffccc2cb296960d3ed755979167 to dev
+* Cherry-pick 4482d13ff75dadc68df64758a35976c5cbeadbc6 to dev
+* Cherry-pick 5a45b2a62b3d647b7b4feca78da5948b5d108573 to dev
+* Cherry-pick 24158b773d29d36305ce6e8dbc1a1ce24a54e58e to dev
+* Cherry-pick 68bfaf3ac349e78cf5a7ea78d48e0b51bae2e605 to dev
+* Cherry-pick 23ba527735b386371395cd06c4cf39381072fc89 to dev
+* Cherry-pick 72960de5f9a8bc36c7a6265d56c6643d93c512b5 to dev
+
+## 2.0.0-dev.69.4
+
+* Revert cherry-pick 9727a4a to dev
+* Cherry-pick 6bddb6c to dev
+* Cherry-pick 57e11e3 to dev
+* Cherry-pick 0998153 to dev
+
 ## 2.0.0-dev.69.3
 
 Cherry-pick f3625375744979a4c65e289a3140cbdd7fbf6f32 to dev

foo

diff --git a/foo b/foo
deleted file mode 100644
index e69de29..0000000
--- a/foo
+++ /dev/null

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index 7c09085..01a87d1 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 0
 PATCH 0
 PRERELEASE 69
-PRERELEASE_PATCH 4
+PRERELEASE_PATCH 5