Commit 4f690319 authored by Li, Guizi's avatar Li, Guizi
Browse files

Merge branch 'master' into guizili/pad_fusedconv 

Conflicts:
	tensorflow/core/graph/mkl_layout_pass.cc
parents afae41cb 25c536db
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment