tree cab72d8ae4a20281fa2039657dba4de389f3fe75
parent 60d518339630880f6a10599c639c8217048fe827
parent fcd14f13a1e05bc1958bfeaba95678b9bf4b121e
author Sami Tolvanen <samitolvanen@google.com> 1426114952 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426114952 +0000

am fcd14f13: am 9fabbbfb: Merge "Do not call libcutils property_set in init through libfs_mgr"

* commit 'fcd14f13a1e05bc1958bfeaba95678b9bf4b121e':
  Do not call libcutils property_set in init through libfs_mgr