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

* commit '24ddd8f2e18fbaa6cc79204358f6378a8a106767':
  Fix IllegalStateException in Dialer
tree: 9c85616e84f4d3bc731502e97981446019715c13
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags