tree dccbb69d1676324b5480c33bffacb8192f4f43f4
parent 53bf49dcb703b155994c57e59e1a045463b10bb8
parent 956e41b9362b3dfabc3b6ffcb696d7f429b91b92
author Nancy Chen <nancychen@google.com> 1418167263 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418167263 +0000

am 956e41b9: am dd24a8b2: am f5dc3a52: Merge "Use a BroadcastReceiver for Dialpad behavior upon call hangup." into lmp-mr1-dev

* commit '956e41b9362b3dfabc3b6ffcb696d7f429b91b92':
  Use a BroadcastReceiver for Dialpad behavior upon call hangup.