Merge change 4674 into donut

* changes:
  FIX 1914930 -- 	Bad state of Emergency Dialer after orientation change.
tree: da599851ccefc4e07d8290f983b951244e313fce
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE