commit 82831c3d26e5b38bd24bbd241dac40e09fd9ba4b
author Daniel Rosenberg <drosen@google.com> Tue Nov 11 22:47:04 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 11 22:47:04 2014 +0000
tree 38b41164f39bac8e3833d651b1598350f92452a2
parent 556f43820f90e78bbe8fc6f7dea6be865e975ab8
parent 4b862563be2627864590be7dd071c1d0289a6f33

am 4b862563: Merge "property_service: Added vendor build properties to load_all_props"

* commit '4b862563be2627864590be7dd071c1d0289a6f33':
  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 d908ba8..44658c5 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -538,6 +538,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_FACTORY, "ro.*");
 
     load_override_properties();