tree 5751d06f3ff10dd2441fc0521fcc08e54e57615f
parent 050eb28ab512928ddcd38307857e8e6fdbc7b741
parent 55d80586c76580bf6cbc00e9bd89658a72aa985b
author Trevor Johns <tjohns@google.com> 1260918379 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260918379 -0800

am 55d80586: am 5dba584a: Merge change Ic3464854 into eclair

Merge commit '55d80586c76580bf6cbc00e9bd89658a72aa985b'

* commit '55d80586c76580bf6cbc00e9bd89658a72aa985b':
  Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.