am 0ce3c37d: am 24ddd8f2: am 0b8f2803: Merge "Fix IllegalStateException in Dialer" into lmp-dev

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