tree 5bc37412989bf120ed7a20ffdbb2929da2f5d6c5
parent 256ddaa8a55c55e27334b844702ed0ec1885ddc7
parent 51b158459a0535a52b32494555c6f2b420ac0980
author Evan Millar <emillar@google.com> 1254423551 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254423551 -0700

am 51b15845: am 08816769: Change FasttrackBadgeWidget->QuickContactBadge

Merge commit '51b158459a0535a52b32494555c6f2b420ac0980'

* commit '51b158459a0535a52b32494555c6f2b420ac0980':
  Change FasttrackBadgeWidget->QuickContactBadge