Merge "Fix various IllegalStateExceptions in Dialer" into lmp-mr1-dev
tree: 37d687fa7cf5d581b78af8f89a176a41b7a96671
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags