Merge pull request #19544 from yongtang/05182018-duplicate-import
authorMichael Case <mikecase@google.com>
Fri, 25 May 2018 22:28:58 +0000 (15:28 -0700)
committerGitHub <noreply@github.com>
Fri, 25 May 2018 22:28:58 +0000 (15:28 -0700)
Remove duplicate `from six import text_type` in upload_test_benchmarks.py


Trivial merge