tree 8bdb17108214dc0c706ca6a6763af7c4c733a287
parent f998116bb07375c4cfbd35aa4852ff9ca36600ad
parent 72be6d5eea001e7bd1bc7b31e8c7e81a0c4a9cff
author Mark Salyzyn <salyzyn@google.com> 1400867304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400867304 +0000

am 72be6d5e: Merge "cpio: Turn on -Werror"

* commit '72be6d5eea001e7bd1bc7b31e8c7e81a0c4a9cff':
  cpio: Turn on -Werror