base

Merge change 25636 into eclair

* changes:
  Add each contact in vCard into "My Groups" if account is for Google's and it has such a group. This fix should be temporal. Should be fixed in the near future.