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

* commit 'e2ebaea4156fa02f18d176fdd084e8f1221c5cfb':
  Fix IllegalStateException in Dialer
tree: e385fa8f93b9db58015bbaaa33aa0db12fb4a006
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags