tree e729af738a12a7a30c3a2f09fa715a45c08c0243
parent 711de648debe788217aef414e4d02b2b2f12f7a9
parent e7a311ac0687527908311a4226481e3abe9c6f81
author John Wang <johnwang@google.com> 1280788556 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280788556 -0700

am e0b35c6d: (-s ours) am 8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread

Merge commit 'e0b35c6d44ea548b52a4e536b2dbd03c94b0afd3'

* commit 'e0b35c6d44ea548b52a4e536b2dbd03c94b0afd3':
  Handle call list in CallManager "do not merge".
  Create CallManager class "do not merge"