tree 52dba7f95c49242933ea5eb88da7a380e704f1c7
parent 19188955b50ef6cb133780f66384e9fa055acfac
parent e755dfd43812ebd9a0d0d6a2106316f343ffb5a2
author Colin Cross <ccross@android.com> 1371663222 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371663222 -0700

am e755dfd4: Merge changes I1db3137b,I0f66144e

* commit 'e755dfd43812ebd9a0d0d6a2106316f343ffb5a2':
  toolbox: reimplement watchprops using __system_property_foreach()
  libcutils: reimplement property_list() using __system_property_foreach()