From: Evan Millar <emillar@google.com>
Date: Thu, 1 Oct 2009 06:32:27 +0000 (-0700)
Subject: am 512f4c18: Merge change I511ba352 into eclair
X-Git-Tag: android-x86-2.2~159^2~90
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=39c5d7b8;p=android-x86%2Fpackages-apps-Contacts.git

am 512f4c18: Merge change I511ba352 into eclair

Merge commit '512f4c18a4c14f73faa2396455b94beead940d4f' into eclair-plus-aosp

* commit '512f4c18a4c14f73faa2396455b94beead940d4f':
  Remove tabs, join, and aggregate badge from ViewContactActivity
---

39c5d7b88da0ba4a47e07a53c64284c14731975b