tree d13a37ab2979bd65779f8568e3b3962bc4a970a3
parent 361655a48f91cf6d9f627d0f5201ba89fe9471e3
parent 7962e6910490286117c6b5a55550313dc7e5815c
author Santos Cordon <santoscordon@google.com> 1384891496 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384891496 -0800

am 4a2cf432: am 439ddb20: am 59dc0b9d: Merge "Decrease the timeout for unknown endcall screen from 5 to 2 sec." into klp-dev

* commit '4a2cf4323afeb9127f195e6f9bc098bedfba5438':
  Decrease the timeout for unknown endcall screen from 5 to 2 sec.