tree 42f41df574ecbb63f6b2d5056242b0d6dcc9c708
parent f7c287b750a2353976fc51aa3b45b380024ae84b
parent 6b66025f6f3e48d182e8d6aeb989d0f39eb551e3
author Mark Salyzyn <salyzyn@google.com> 1412864405 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412864405 +0000

am 6b66025f: Merge "fs_mgr: fix build breakage"

* commit '6b66025f6f3e48d182e8d6aeb989d0f39eb551e3':
  fs_mgr: fix build breakage