Merge "Replace deprecated scoped_ptr with unique_ptr"
authorJingning Han <jingning@google.com>
Tue, 27 Nov 2018 19:01:26 +0000 (19:01 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 27 Nov 2018 19:01:26 +0000 (19:01 +0000)

Trivial merge