tree 9bb91db7d48e62fd2375c50c40de0fcd4f948913
parent 2eb2c185a68af9497b58a5adaee7c4beb93df4a2
parent 8f9abc4769b2cfe2fd47499048657563978b856d
author Santos Cordon <santoscordon@google.com> 1380686296 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380686296 -0700

am 25426bec: am 1f7c971d: Merge "Add deadzone to end call button." into klp-dev

* commit '25426bec5132517edb39fe2b12609d2d585a59db':