am 7cb020a9: am 41c271bb: Merge change Iae0bc856 into eclair

Merge commit '7cb020a94773d7410e09cbc1743bfab80578f0e9' into eclair-mr2-plus-aosp

* commit '7cb020a94773d7410e09cbc1743bfab80578f0e9':
  A sample application that demonstrates use of legacy and current contacts APIs.