am a18f2501: am 1edf4ff1: Merge "Fix crash when recreating activity and receiving dial intent"

* commit 'a18f250174398fbfb4fe2413588a3a3020361381':
tree: 967f2714b7c695a2c8690d8099672ae2c639bbb8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags