Merge pull request #19470 from ankurtaly/branch_197583446

author ankurtaly <ataly@google.com>

Fri, 25 May 2018 21:43:38 +0000 (14:43 -0700)

committer GitHub <noreply@github.com>

Fri, 25 May 2018 21:43:38 +0000 (14:43 -0700)
author ankurtaly <ataly@google.com>
Fri, 25 May 2018 21:43:38 +0000 (14:43 -0700)
committer GitHub <noreply@github.com>
Fri, 25 May 2018 21:43:38 +0000 (14:43 -0700)
diff --cc tensorflow/core/BUILD
Simple merge
diff --cc tensorflow/workspace.bzl
Simple merge
author	ankurtaly <ataly@google.com>
	Fri, 25 May 2018 21:43:38 +0000 (14:43 -0700)
committer	GitHub <noreply@github.com>
	Fri, 25 May 2018 21:43:38 +0000 (14:43 -0700)
		1	2
tensorflow/core/BUILD	patch \|	diff1 \|	diff2 \|	blob \| history
tensorflow/workspace.bzl	patch \|	diff1 \|	diff2 \|	blob \| history