Merge "Remove unnecessary backup token stream pointer"
authorJingning Han <jingning@google.com>
Fri, 17 Apr 2015 16:13:53 +0000 (09:13 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 17 Apr 2015 16:13:53 +0000 (09:13 -0700)

Trivial merge