Merge pull request #19355 from tensorflow/mrry-patch-2
authorMartin Wicke <577277+martinwicke@users.noreply.github.com>
Fri, 18 May 2018 00:06:37 +0000 (17:06 -0700)
committerGitHub <noreply@github.com>
Fri, 18 May 2018 00:06:37 +0000 (17:06 -0700)
Include <algorithm> in .pb_text.cc generated files


Trivial merge