tree 7a49551431886c3e6577bc7438eca294a5bccdb5
parent 633a2e3b6a1d00257965a5772a5467a6df9911a5
parent f1c66a852f8b6a888308c6a154a7d98bf262e480
author Mark Salyzyn <salyzyn@google.com> 1400780648 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400780648 +0000

am f1c66a85: am 5e9c2b9f: Merge "reboot: Turn on -Werror"

* commit 'f1c66a852f8b6a888308c6a154a7d98bf262e480':
  reboot: Turn on -Werror