commit | a642e27372bc9a4d7438037a46e31f96a7d8e87a | [log] [tgz] |
---|---|---|
author | Dmitri Plotnikov <dplotnikov@google.com> | Fri Oct 30 17:02:27 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 30 17:02:27 2009 -0700 |
tree | 235dde85cc43dcec0b3b7acc312cf51459fff649 | |
parent | 3b27199aa7022b8319036e271069159d99dd5135 [diff] | |
parent | b4e61e064b59e8076df81b061add9fb358fd2ed9 [diff] |
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