Merge "Fix incorrect size reading"
authorJohann <johannkoenig@google.com>
Wed, 18 Dec 2013 05:26:50 +0000 (21:26 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 18 Dec 2013 05:26:50 +0000 (21:26 -0800)

Trivial merge