am cb337a6f: am ed87b51c: am 9a75d6d8: Merge change I63646eb5 into eclair

Merge commit 'cb337a6f85d2372467fbae7fd612113908c489a5'

* commit 'cb337a6f85d2372467fbae7fd612113908c489a5':
  Fixing ContactsProvider2 test breakage.