tree c7dca95cef1d1a3d5e8d9201e08c8db667bf39b6
parent 99af2e818e8ec033821d6d955fb3834879741309
parent 9e81b599a0d0d1194c220a5812fbdf41300231d4
author Yorke Lee <yorkelee@google.com> 1380754062 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380754062 -0700

am 9e81b599: am 104f0cfa: Merge "Don\'t allow dialpad presses until it is fully in position" into klp-dev

* commit '9e81b599a0d0d1194c220a5812fbdf41300231d4':
  Don't allow dialpad presses until it is fully in position