tree b3a555b19173e343eb4bfc242970c9a5c1a12717
parent ad921cb4a421e8caf241b977818cf0b9fd19303c
parent 5964e73774b381748013b91d04dfb6fc60f533ee
author Eric Laurent <elaurent@google.com> 1247168978 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1247168978 -0700

am 5964e737: Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call

Merge commit '5964e73774b381748013b91d04dfb6fc60f533ee'

* commit '5964e73774b381748013b91d04dfb6fc60f533ee':
  Fix issue 1946033: dialer deadlocks and/or ANRs when using dialpad in-call