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