Merge "Fix valgrind error in pickmode."
authorAlex Converse <aconverse@google.com>
Wed, 20 Aug 2014 00:46:27 +0000 (17:46 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 20 Aug 2014 00:46:27 +0000 (17:46 -0700)

Trivial merge