am b980261e: am 95fcc727: am 7d1fc75d: am f8693fe8: Merge "Fix Contacts_PeopleTest" into gingerbread

* commit 'b980261ee306ba7c82911a3b1d44ba723b66b39d':
  Fix Contacts_PeopleTest