tree 9bfbaab1b50565b100c56222a69f117467a76502
parent 97d08fe7303ee18cb089e85738e32b0fe436407c
parent a848a7b8f5152f8a0b1ecad6953449989e9adc18
author Yorke Lee <yorkelee@google.com> 1409081727 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409081727 +0000

am a848a7b8: Merge "Revert "Fix IllegalStateException in Dialer"" into lmp-dev

* commit 'a848a7b8f5152f8a0b1ecad6953449989e9adc18':
  Revert "Fix IllegalStateException in Dialer"