| commit | 0c511ed637ec8b49db85d52f4030ac5ae5509db0 | [log] [tgz] |
|---|---|---|
| author | Dmitri Plotnikov <dplotnikov@google.com> | Sun Nov 01 21:55:48 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 01 21:55:48 2009 -0800 |
| tree | 7ff47b614bdb82f1d07da0588210b3a8b9871a24 | |
| parent | d6a107ace79280d1f96f0d13af084dad4761069f [diff] | |
| parent | a642e27372bc9a4d7438037a46e31f96a7d8e87a [diff] |
am a642e273: am b4e61e06: resolved conflicts for merge of 62715245 to eclair-mr2 Merge commit 'a642e27372bc9a4d7438037a46e31f96a7d8e87a' * commit 'a642e27372bc9a4d7438037a46e31f96a7d8e87a': Making the first account "adopt" contacts created on the phone before any accounts