tree 4e614fcf18cf8cd6531bfd66e2b598f774585d9c
parent 7d28098b9adc450ca26c73b02b025a02891a0766
parent b05866afccd10b005e97804319abdd361b311f2a
author Mark Salyzyn <salyzyn@google.com> 1400785881 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400785881 +0000

am b05866af: Merge "libion: Turn on -Werror"

* commit 'b05866afccd10b005e97804319abdd361b311f2a':
  libion: Turn on -Werror