tree 982fd76eb260456e4a08953ad223fecb20b5b6b3
parent 2af4186c4d832336417354b3b3e1114af20a2645
parent 0a9f6c8c65aa5fc30a21900966108ebab8431845
author Mark Salyzyn <salyzyn@google.com> 1429142390 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429142390 +0000

am 0a9f6c8c: Merge "libcutils: fs_config read from file"

* commit '0a9f6c8c65aa5fc30a21900966108ebab8431845':
  libcutils: fs_config read from file