tree cba6f21543a8244d6ab57a1969c49884d65f7612
parent 9bc5dd95f72e43e5e640ad7674dba52bc5b30c4b
parent 1525ed874f8611368ef34a9fc5556cc9130ccee6
author Ian Rogers <irogers@google.com> 1415074402 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415074402 +0000

am 1525ed87: am a10a8b56: Merge "Remove -Wno-unused-parameter and -Wno-sign-promo from base cflags."

* commit '1525ed874f8611368ef34a9fc5556cc9130ccee6':
  Remove -Wno-unused-parameter and -Wno-sign-promo from base cflags.