tree a24b3b3bee32cd9855c55767850232a5ff13c960
parent bba2ed8a6af1a2deb192c49b7ae1a9421e20b1f7
parent 8a53132710fc7f32056fe50f680edf11241384ad
author Mark Salyzyn <salyzyn@google.com> 1400786466 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400786466 +0000

am 8a531327: am 1010b672: am b05866af: Merge "libion: Turn on -Werror"

* commit '8a53132710fc7f32056fe50f680edf11241384ad':
  libion: Turn on -Werror