commit 03e45da4fee72c9ebe9416c36d8bc60a43ec028e
author Andres Morales <anmorales@google.com> Wed Jan 14 16:09:02 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 14 16:09:02 2015 +0000
tree ef2c08783e7a79de8474093f363cda89649c1292
parent 8ee7ff7536c150139b2eb2371d9e170264e69a82
parent 49beb7e01be1c7a9914371fb6f8d2c9d76c46a7e

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

* commit '49beb7e01be1c7a9914371fb6f8d2c9d76c46a7e':
  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();