tree 38b41164f39bac8e3833d651b1598350f92452a2
parent 556f43820f90e78bbe8fc6f7dea6be865e975ab8
parent 4b862563be2627864590be7dd071c1d0289a6f33
author Daniel Rosenberg <drosen@google.com> 1415746024 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415746024 +0000

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