Merge "Improved token decoder"
authorScott LaVarnway <slavarnway@google.com>
Tue, 25 Oct 2011 17:04:11 +0000 (10:04 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 25 Oct 2011 17:04:11 +0000 (10:04 -0700)

Trivial merge