Commit d491cb2d authored by Shanqing Cai's avatar Shanqing Cai
Browse files

Merge commit for internal changes 

Manually resolved conflicts:
  tensorflow/python/kernel_tests/svd_op_test.py
  tensorflow/python/ops/math_grad.py
parents 2ab7e632 ecf5c9cd
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