tree d04e2c2aec587c53292f8450d0764daf9661532c
parent 28c305183a6596eb3241771422d22351fbeaa9fb
parent 2f62edf77d94caaca57ff5e36bd866e02f3c2fa0
author Mark Salyzyn <salyzyn@google.com> 1400706503 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400706503 +0000

am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"

* commit '2f62edf77d94caaca57ff5e36bd866e02f3c2fa0':
  libdiskconfig: Turn on -Werror