tree 77cd2d6f51e7d272e38bd4e23f615849d08bca57
parent 48399e38c978a66ac4c6054c8681a246dfc94b4b
parent 794cd640bfa8c6d82803b59bc18cbd73627a8162
author Marc Blank <mblank@google.com> 1272580830 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272580830 -0700

am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo

Merge commit '794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp

* commit '794cd640bfa8c6d82803b59bc18cbd73627a8162':
  Expose _id in ExtendedProperties subValues