commit ca3c6b3b9fa29098e0998012b5037756e7423eb2
author Elliott Hughes <enh@google.com> Thu Apr 16 20:31:39 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 16 20:31:39 2015 +0000
tree 26a4f833cdf2144493ac82bcf7f214887ce3ad5e
parent 7fb424eed8506c6cfee9ceeb161c3499b66a44dc
parent e97aa74e8e5dcfd8656b8fbaea6f06974121ee1b

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

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