tree 36eb5203287ee6bbddec26100e3c83ff55afbca5
parent bd958e4428263eac17107a33d54a2751c37cc0b7
parent 3a6f9ded543db6cb7a2842540a2b67b0356b21ae
author Matthew Xie <mattx@google.com> 1320875461 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320875461 +0000

am 3a6f9ded: am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1

* commit '3a6f9ded543db6cb7a2842540a2b67b0356b21ae':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp