tree 4934a2f719ae1ece93f72caf41a3a021afe9f37e
parent 95d616c2c7c87a7c34c57461cf8445a2b1e8ec70
parent e6246ca6cc48e182cc5e193510b05f8889ba9aed
author Mark Salyzyn <salyzyn@google.com> 1399581393 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399581393 +0000

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

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