am 5dba584a: Merge change Ic3464854 into eclair

Merge commit '5dba584a08e6d2d5c84ca971b796e053995e4214' into eclair-plus-aosp

* commit '5dba584a08e6d2d5c84ca971b796e053995e4214':
  Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.