Merge change I46a6d39c into eclair

* changes:
  Remove unused api in QuickContact.java and fix the build.