Commit 5310ce26 authored by Shanqing Cai's avatar Shanqing Cai
Browse files

Merge commit for internal changes 

Manually resolved conflicts in:
  tensorflow/compiler/tf2xla/BUILD
  tensorflow/contrib/gan/python/eval/python/classifier_metrics_impl.py
parents 6fcc8338 827fe7bb
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