Fix merge issues
authorSami Kama <sami.kama.git@gmail.com>
Mon, 12 Feb 2018 21:37:42 +0000 (13:37 -0800)
committerSami Kama <sami.kama.git@gmail.com>
Mon, 12 Feb 2018 21:37:42 +0000 (13:37 -0800)
commit14948a8aeb23924687bbe02ec6e586b37acb102f
tree19eba90370c3545e8517eb04a2b58a72d9fe69d8
parent35ba5d8dc8899e28ac789dc493f0dd205e169c74
parent21a9ca4487d0d3ef9f2aa2ba5909b37c735c18e6
Fix merge issues
tensorflow/contrib/tensorrt/test/test_tftrt.py