tree da153587894516b291324fda99ad59760d6e10d4
parent 970f7062f50ba5056305ab8fce62d97d13f267b4
parent af0df46d74368bb98edaadb3c09ddbc7252d3110
author Mark Salyzyn <salyzyn@google.com> 1399585386 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399585386 +0000

am af0df46d: am e6246ca6: am 01ef52e1: Merge "fs_mgr: turn on -Werror"

* commit 'af0df46d74368bb98edaadb3c09ddbc7252d3110':
  fs_mgr: turn on -Werror