commit 22f0e10727014cfa237db66c884dca7defc22dda
author Elliott Hughes <enh@google.com> Thu Apr 16 20:03:32 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 16 20:03:32 2015 +0000
tree 3999ede6f2bd45c6556f3f3d1fc20dc3d60849bc
parent 8b9d80f1377b5d7b6d9580f6fcfc843fd621207f
parent 1691170caf08646aab8ea83083f3e67beeacc96a

am 710fd65e: Merge "Don\'t try to read /system/default.prop."

* commit '710fd65e5ff42780ac5b84b17153d57a81105a20':
  Don't try to read /system/default.prop.

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 2fa81d4..8544951 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -508,7 +508,6 @@
 
 void load_all_props() {
     load_properties_from_file(PROP_PATH_SYSTEM_BUILD, NULL);
-    load_properties_from_file(PROP_PATH_SYSTEM_DEFAULT, NULL);
     load_properties_from_file(PROP_PATH_VENDOR_BUILD, NULL);
     load_properties_from_file(PROP_PATH_BOOTIMAGE_BUILD, NULL);
     load_properties_from_file(PROP_PATH_FACTORY, "ro.*");