Merge "Fix aligned memory allocation in unit tests"
authorJingning Han <jingning@google.com>
Wed, 26 Jun 2013 19:21:05 +0000 (12:21 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 26 Jun 2013 19:21:05 +0000 (12:21 -0700)

Trivial merge