commit 04d0c71d2bf62f204102ec2db3f2f8dd043e5ffb
author Andres Morales <anmorales@google.com> Fri May 08 18:03:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 08 18:03:44 2015 +0000
tree 1dd9722929f31c29d6be0df6f34738fdd9e21049
parent a4ded75232ac353ec40af011d141188cc4162fb5
parent ecc046e402d53f9fb6183e023b2d55f57d41e060

am bccc75a7: Merge "stop including rootdir build.prop"

* commit 'bccc75a7c8c758372a847f3062b06dd6b328a63f':
  stop including rootdir build.prop

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 930ef82..526e8ac 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -509,7 +509,6 @@
 void load_all_props() {
     load_properties_from_file(PROP_PATH_SYSTEM_BUILD, 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.*");
 
     load_override_properties();