From: Tadashi G. Takaoka <takaoka@google.com>
Date: Wed, 7 Oct 2009 23:30:27 +0000 (-0700)
Subject: am 41449696: Merge change Ia961aa60 into eclair
X-Git-Tag: android-x86-2.2~176^2~20^2~70
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=35fb5ef3f5b58e1e412754599dd321ca74784d9b;p=android-x86%2Fpackages-apps-Contacts.git

am 41449696: Merge change Ia961aa60 into eclair

Merge commit '4144969616439687e30d1beec041e6dee951bb37' into eclair-mr2

* commit '4144969616439687e30d1beec041e6dee951bb37':
  Contacts: fixed custom label handling in GenericEditorView.
---

35fb5ef3f5b58e1e412754599dd321ca74784d9b