am 6a15ad7d: DO NOT MERGE Fix crash when recreating activity and receiving dial intent

* commit '6a15ad7de372e6c21a00dd40a6ae089260cfaedf':
  DO NOT MERGE Fix crash when recreating activity and receiving dial intent
tree: 4b966f61154fba7a7e99185af0011de56408163e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags