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.