tree ce9a4197ae4a4ae8a43c0e26d2b8d0a41c86bf3b
parent d2cd188936750b9e6205fe5cd5d9178ab5fb6192
parent d2492e3da280842b55d18d54f754da164c2537e2
author Chung-yih Wang <cywang@google.com> 1284637695 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284637695 -0700

am 170255b0: am d8f3d167: Add a new phone state ANSWERING.

Merge commit '170255b0f0482baf843b881a02d9361adcc33742'

* commit '170255b0f0482baf843b881a02d9361adcc33742':
  Add a new phone state ANSWERING.