Merge commit for internal changes
authorAkshay Modi <nareshmodi@google.com>
Tue, 6 Mar 2018 22:09:03 +0000 (14:09 -0800)
committerAkshay Modi <nareshmodi@google.com>
Tue, 6 Mar 2018 22:09:03 +0000 (14:09 -0800)
commit69c36c2e6de93e93fe47eb1276369e272e0ce70f
treec5809ec63fd7cf5053cf9fd2e52cc65e9d41c4a7
parent1f441c191f9a6d8f27b32b1c19c55f76aaf9e387
parente79a3d99e43b797036d0e35ab9b332e371108a5d
Merge commit for internal changes

o Fixed simple merge issue in tf/contrib/timeseries/python/timeseries/BUILD
13 files changed:
tensorflow/cc/gradients/nn_grad.cc
tensorflow/contrib/distributions/BUILD
tensorflow/contrib/eager/python/BUILD
tensorflow/contrib/timeseries/python/timeseries/BUILD
tensorflow/core/framework/dataset.h
tensorflow/python/BUILD
tensorflow/python/framework/test_util.py
tensorflow/python/keras/BUILD
tensorflow/python/ops/array_ops.py
tensorflow/python/ops/losses/losses_impl.py
tensorflow/python/ops/math_grad.py
tensorflow/python/ops/math_ops.py
tensorflow/tools/api/golden/tensorflow.pbtxt