tree d64408ae79fbef46a11efb5dc7229bcb49c1cb6a
parent 11e6c3b10b6de3ea64f24ca044c62b9848450904
parent 8265c1eb4d2c3fc627cded0bbbee5ca5325b6b98
author Yorke Lee <yorkelee@google.com> 1414537036 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414537036 +0000

am 8265c1eb: Merge "Fix various IllegalStateExceptions in Dialer" into lmp-mr1-dev

* commit '8265c1eb4d2c3fc627cded0bbbee5ca5325b6b98':
  Fix various IllegalStateExceptions in Dialer