Merge "Remove unnecessary code"
authorHui Su <huisu@google.com>
Tue, 18 Sep 2018 18:36:59 +0000 (18:36 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 18 Sep 2018 18:36:59 +0000 (18:36 +0000)

Trivial merge