| commit | 901d4e94e5ad5930cd71d989810bbb6dab9335c6 | [log] [tgz] |
|---|---|---|
| author | Cary Clark <cary@android.com> | Fri Nov 06 11:29:40 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 06 11:29:40 2009 -0800 |
| tree | 8e4907a35aa40751d47baa9dadcc8753b1ea1ec5 | |
| parent | 8a0f0f88dd32270f1110b5fb631c1d24cca856a5 [diff] | |
| parent | c948ba7f7ffabe1d9740098eb8488be26ccaacab [diff] |
am 45011f2d: (-s ours) Merge change I4e9fe62b into eclair Merge commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80' into eclair-mr2 * commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80': do not merge -- original checkin to mr2 here: