Merge "Revert "Fix IllegalStateException in Dialer"" into lmp-dev
tree: 10866e8e03855d48c93f099d89a0bb62f73da239
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags