tree f37fcfc03cefd56cb03cdadc3f543e98f1cc0a77
parent ebdf9ed09abf0631d6b4848916ef6e4c3cf654ad
parent b980261ee306ba7c82911a3b1d44ba723b66b39d
author Brian Muramatsu <btmura@android.com> 1297379041 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297379041 -0800

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

* commit 'b980261ee306ba7c82911a3b1d44ba723b66b39d':
  Fix Contacts_PeopleTest