Merge change Iae0bc856 into eclair

* changes:
  A sample application that demonstrates use of legacy and current contacts APIs.