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