commit 51f33fca6b2cf2f91896eb2ab5fe6661b8401bc9
author Andres Morales <anmorales@google.com> Thu Jan 15 02:27:45 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 15 02:27:45 2015 +0000
tree 2915834f3f3201709fcb343230eed1ce20a6cc81
parent 7ff4f34413e1d82fc78634390357858466c8ac7a
parent 03e45da4fee72c9ebe9416c36d8bc60a43ec028e

am 03e45da4: am 49beb7e0: Merge "property_service: Added vendor build properties to load_all_props"

* commit '03e45da4fee72c9ebe9416c36d8bc60a43ec028e':
  property_service: Added vendor build properties to load_all_props

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index 1f98e13..55e37b9 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -534,6 +534,7 @@
     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.*");
 
     load_override_properties();