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

* commit '710fd65e5ff42780ac5b84b17153d57a81105a20':
  Don't try to read /system/default.prop.
This commit is contained in:
Elliott Hughes 2015-04-16 20:03:32 +00:00 committed by Android Git Automerger
commit 4048e09112

View file

@ -508,7 +508,6 @@ void load_persist_props(void) {
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.*");