| commit | 1b77332f0c098db181cba88b0a8de06353127d90 | [log] [tgz] |
|---|---|---|
| author | Dmitri Plotnikov <dplotnikov@google.com> | Thu Dec 03 10:48:24 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 03 10:48:24 2009 -0800 |
| tree | 430d80081f5916ac9e5c76d854c6cff360e7dcbc | |
| parent | 4baae9d22cc10a0b183c907dc25ef14fca74819e [diff] | |
| parent | 21454ad556283edf003f3c728733e8277ee973c6 [diff] |
am 21454ad5: (-s ours) am b6eeec4b: am 1b6c85b9: (-s ours) DO NOT MERGE cherry-pick of CL I0ff20aa2 from eclair-mr2 Merge commit '21454ad556283edf003f3c728733e8277ee973c6' * commit '21454ad556283edf003f3c728733e8277ee973c6': DO NOT MERGE cherry-pick of CL I0ff20aa2 from eclair-mr2