tree 2192906bc31f5c64250f449b799300f844f53c14
parent fcf3949b994cb3f34598d177c9df2590661acb56
parent 7d1fc75dfe7de96b2c13bb5215e1eeb7e4a7bea8
author Brian Muramatsu <btmura@android.com> 1297370164 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297370164 -0800

am 7d1fc75d: am f8693fe8: Merge "Fix Contacts_PeopleTest" into gingerbread

* commit '7d1fc75dfe7de96b2c13bb5215e1eeb7e4a7bea8':
  Fix Contacts_PeopleTest