Merge "Android NDK support for x86 and mips"
authorJohann <johannkoenig@google.com>
Wed, 7 May 2014 15:54:13 +0000 (08:54 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 7 May 2014 15:54:13 +0000 (08:54 -0700)

Trivial merge