Merge "Remove asm offset dependencies"
authorJohann <johannkoenig@google.com>
Mon, 10 Nov 2014 18:22:09 +0000 (10:22 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 10 Nov 2014 18:22:09 +0000 (10:22 -0800)

Trivial merge