tree ee68521cb2e6aaa3525c70a62a255ee2c9ec1879
parent eb24a1c288fe94dfc62aa4f74fd8861ad16dabd6
parent c130d96e9cf786d17196a400a07fb4e6e221a07c
author Mark Salyzyn <salyzyn@google.com> 1429144353 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429144353 +0000

am c130d96e: am e1b87e1a: am 48257704: Merge "libcutils: add fs_config_generate"

* commit 'c130d96e9cf786d17196a400a07fb4e6e221a07c':
  libcutils: add fs_config_generate