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

* commit '1edf4ff108eacf0590223060c365b2b7eb1b6d5a':
  Fix crash when recreating activity and receiving dial intent
tree: 4465eb8da1fe09cf66d9006929d6acd75382082b
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags