Merge branch 'master' of https://github.com/tensorflow/tensorflow into optimization_pass
authorgracehoney <31743510+aaroey@users.noreply.github.com>
Wed, 2 May 2018 15:52:39 +0000 (08:52 -0700)
committergracehoney <31743510+aaroey@users.noreply.github.com>
Wed, 2 May 2018 15:52:39 +0000 (08:52 -0700)

Trivial merge