Merge branch 'master' of https://github.com/ppwwyyxx/tensorflow into pr16817
authorMark Daoust <markdaoust@google.com>
Wed, 4 Apr 2018 18:55:50 +0000 (11:55 -0700)
committerMark Daoust <markdaoust@google.com>
Wed, 4 Apr 2018 18:55:50 +0000 (11:55 -0700)
commitb4b174b46a87e0570b0a815317d1a6fa4451bd7c
tree8fe7fe9dc162c9a6ad302c83b7360bac15cb7376
parent5d33c1e49178aedbb459da7ce58eca710102c06b
parent590f23bb980a729abdf74e19e6a0b9141f492cfa
Merge branch 'master' of https://github.com/ppwwyyxx/tensorflow into pr16817