commit e97aa74e8e5dcfd8656b8fbaea6f06974121ee1b
author Elliott Hughes <enh@google.com> Thu Apr 16 20:13:37 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 16 20:13:37 2015 +0000
tree fdf63453143e731fce4e4f2302c5862c449b8b13
parent cefbd979d9e2d51301d8c7aade8986d2f9189d04
parent 22f0e10727014cfa237db66c884dca7defc22dda

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

* commit '4048e0911244304e0d31cbc66531c26e99ee7752':
  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.*");