tree 5a4470a733499b0b11d6a9e7af0bc4b3b1cd23e3
parent 96886f53a6a2255c3edf14a45bf2a84d3c1d125c
parent 1291df76956407d08e673443786f92c9a16006c1
author Mark Salyzyn <salyzyn@google.com> 1400786467 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400786467 +0000

am 1291df76: am c5fa4b19: am 065c2706: Merge "libsuspend: Turn on -Werror"

* commit '1291df76956407d08e673443786f92c9a16006c1':
  libsuspend: Turn on -Werror