Merge "Fix iphonesimulator and armv6-darwin build targets."
authorTom Finegan <tomfinegan@google.com>
Thu, 2 Oct 2014 04:05:25 +0000 (21:05 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 2 Oct 2014 04:05:25 +0000 (21:05 -0700)

Trivial merge