Merge "Clean Android build defaults"
authorJohann <johannkoenig@google.com>
Fri, 22 Jun 2012 19:56:01 +0000 (12:56 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 22 Jun 2012 19:56:01 +0000 (12:56 -0700)

Trivial merge