tree 4a5578a6ed456456153b82ab2d8a44770b1ac25f
parent ff55fbfa8cf30fe8a72e1a68420cd744ce957828
parent 6a148f10d0e26eef9f94e08ac3f1897ce8983bfa
author Jaikumar Ganesh <jaikumar@google.com> 1273884630 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273884630 -0700

am 6a148f10: Run Bluetooth Opp activities in the phone process.

Merge commit '6a148f10d0e26eef9f94e08ac3f1897ce8983bfa' into kraken

* commit '6a148f10d0e26eef9f94e08ac3f1897ce8983bfa':
  Run Bluetooth Opp activities in the phone process.