Resubmit changes which were accidentally rolled back.
authorAlexandre Passos <apassos@google.com>
Tue, 13 Mar 2018 21:52:43 +0000 (14:52 -0700)
committerTensorFlower Gardener <gardener@tensorflow.org>
Tue, 13 Mar 2018 21:56:59 +0000 (14:56 -0700)
commit6a99d23094e953fcd01a86acf2543958fd7bd5bb
tree14a20799d0d7bc7a05297dd9df92536306442fed
parent79bc70cba307e9829a209a39733c9f5a387ec74d
Resubmit changes which were accidentally rolled back.

PiperOrigin-RevId: 188934018
tensorflow/python/framework/ops.py
tensorflow/python/framework/ops_test.py