tree cecf732288834cf4cae7f544c05ea15783a4ac85
parent 6a3cef1ae83e41d4c75b73cd324457934635d5d9
parent f2950041843dfc3c1f1d42db4b2652933e58bdf0
author Santos Cordon <santoscordon@google.com> 1384891182 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384891182 -0800

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

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