tree d8bbbb5689e9b7760b9324b84c217e3d43ae4ba9
parent a134c4145b15bc459736f4935600560fccb291fa
parent e1b87e1a0ee5d9b774fde68df8593b2fdeca4bb2
author Mark Salyzyn <salyzyn@google.com> 1429143035 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429143035 +0000

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

* commit 'e1b87e1a0ee5d9b774fde68df8593b2fdeca4bb2':
  libcutils: add fs_config_generate