tree 5ef3080b123ed691a02ca055b050840e6ae1bc50
parent 8158980be8336c37a30a35de4e1dbbc3b0bb02d3
parent 37fbca223a683b1d914b7b26eaf79da6c29aa113
author Trevor Johns <tjohns@google.com> 1260403003 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260403003 -0800

am 37fbca22: am 5865825d: Merge change Iabe9529e into eclair

Merge commit '37fbca223a683b1d914b7b26eaf79da6c29aa113' into eclair-mr2-plus-aosp

* commit '37fbca223a683b1d914b7b26eaf79da6c29aa113':
  Adding ContactManager sample to SDK samples.