tree 79b4f0a092044a052be21ed30cb7c6728f4200d3
parent db4a942a97964477cedad864fd967bf56e7f438c
parent df4b76e8161eab4908dfa9b25d446272fd7a004e
author Santos Cordon <santoscordon@google.com> 1400026089 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400026089 +0000

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

* commit 'faafd9ed162d307df37a1b871558b5ee091a7cf5':