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

* commit '97ad6c0102cf89973ab436c6dcdd92ebac5dbc48':
  Revert "Fix IllegalStateException in Dialer"
tree: 9bfbaab1b50565b100c56222a69f117467a76502
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags