commit | 852bb213c3a9db16cdec4e36d529fa8f63f25dec | [log] [tgz] |
---|---|---|
author | Mark Salyzyn <salyzyn@google.com> | Wed Apr 15 22:49:59 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 15 22:49:59 2015 +0000 |
tree | 0d4ea8f2169f2b09f6ea61c9b51d766da12e0899 | |
parent | 440dffa252cb05505984c16d8d5d4c6f6228e332 [diff] | |
parent | 8c9f052a77a21c7d771277e88edb0bd64eae9890 [diff] |
am 8c9f052a: am a791ec8a: Merge "Revert "libcutils: fs_config read from file"" * commit '8c9f052a77a21c7d771277e88edb0bd64eae9890': Revert "libcutils: fs_config read from file"