Merge pull request #16785 from av8ramit/merge_branch
authorAmit Patankar <amitpatankar@google.com>
Tue, 6 Feb 2018 19:04:17 +0000 (11:04 -0800)
committerGitHub <noreply@github.com>
Tue, 6 Feb 2018 19:04:17 +0000 (11:04 -0800)
commitb27a5539b78cd95f40138306dbc5729689f90412
treed8947bafdb0d5b7182a8ae55f3d45bc2d3f86667
parentc8717d589d6822419537008e9254f06b25ce7e68
parent036284bfbf78066ef74663bf3750bd728e03459a
Merge pull request #16785 from av8ramit/merge_branch

Merging the 1.6 branch back into master.
tensorflow/contrib/py2tf/converters/BUILD