tree 4351c2dbf37b5a68af873c380e52af8ecc9b7a96
parent 9b530e09884908369f47e4d628e3b8e74692380c
parent 1c699e127b4baeb7f238193b90fac9eb3c178d85
author William Hesse <whesse@google.com> 1469025252 +0200
committer William Hesse <whesse@google.com> 1469025298 +0200

Version 1.18.0-dev.4.4

Cherry-pick faaff39aa9efea958f56e29ba6c9cecfb84d4668 to dev
Cherry-pick ca4930357635d36d43433334271cdfd658a3a746 to dev