tree cfd0aa79135db0cedfa3d8de7f8bbb4ed50ce2af
parent acb5f383eaaf6c8251dde9cb12909a1a9ea0d652
parent 6a1dca3e1c863a3d2db654a1b9fb7156fb3da00d
author Conley Owens <cco3@android.com> 1336180397 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336180397 -0700

am 6a1dca3e: Merge "Telephony: Register/Unregister Phones with CallManager"

* commit '6a1dca3e1c863a3d2db654a1b9fb7156fb3da00d':
  Telephony: Register/Unregister Phones with CallManager