| commit | 984065476286e49aa0eac9128bbb8da3c66d0073 | [log] [tgz] |
|---|---|---|
| author | Dmitri Plotnikov <dplotnikov@google.com> | Thu Nov 05 20:26:55 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 05 20:26:55 2009 -0800 |
| tree | fe3052335a75065234854a0a1efce3a39df0a418 | |
| parent | 3e7dfab3010fcf39841445c2423384086c4ecc92 [diff] | |
| parent | 3410a80f4aafe5685da61c217808d2bf21d55dfc [diff] |
am 3410a80f: resolved conflicts for merge of 1c8e40c1 to eclair-mr2 Merge commit '3410a80f4aafe5685da61c217808d2bf21d55dfc' into eclair-mr2-plus-aosp * commit '3410a80f4aafe5685da61c217808d2bf21d55dfc': Fixing legacy contacts API breakage uncovered by CTS tests