Merge change Ic3464854 into eclair

* changes:
  Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.