am b4e61e06: resolved conflicts for merge of 62715245 to eclair-mr2

Merge commit 'b4e61e064b59e8076df81b061add9fb358fd2ed9' into eclair-mr2-plus-aosp

* commit 'b4e61e064b59e8076df81b061add9fb358fd2ed9':
  Making the first account "adopt" contacts created on the phone before any accounts