tree ef2c08783e7a79de8474093f363cda89649c1292
parent 8ee7ff7536c150139b2eb2371d9e170264e69a82
parent 49beb7e01be1c7a9914371fb6f8d2c9d76c46a7e
author Andres Morales <anmorales@google.com> 1421251742 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421251742 +0000

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