tree e385fa8f93b9db58015bbaaa33aa0db12fb4a006
parent 20347611513c1b3e5a129797f32c091d1a0e91ce
parent 8ab775e5660b716081f1edd267dad2459f204150
author Yorke Lee <yorkelee@google.com> 1412625360 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412625360 +0000

am 8ab775e5: Merge "Fix IllegalStateException in Dialer" into lmp-dev

* commit '8ab775e5660b716081f1edd267dad2459f204150':
  Fix IllegalStateException in Dialer