tree b9e7fc4edc799cfde3316d487adf99dcf83152a8
parent 9d06193f7ed4308199609d3439fa8f3bea5357bd
parent 8352d8fc2dd8e02b123a88f55b134a18dbce964a
author William Hesse <whesse@google.com> 1440498278 +0200
committer William Hesse <whesse@google.com> 1440498278 +0200

Version 1.12.0-dev.5.10

Commit fix for issue #24158 to dev
Cherry-pick 41a12640a43e3be7ba55ee4dee6803e96038da81 to dev
Cherry-pick b547acc88375ecbfd336059cc7893225b3a3ba17 to dev
Cherry-pick 8c346abeef17e95f06c8c7e1c49474d03ac4a2b2 to dev