tree 6f1fa970c8adf1f1930022cb5f7edae9e658a802
parent 3c55219b73cb9a9df3591b1104a32b5972c5e303
parent 0520298e3a58c99bc87a4e8c5f64aa419354159b
author Mark Salyzyn <salyzyn@google.com> 1400874240 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400874240 +0000

am 0520298e: am 0b17e1cf: am 72be6d5e: Merge "cpio: Turn on -Werror"

* commit '0520298e3a58c99bc87a4e8c5f64aa419354159b':
  cpio: Turn on -Werror