| commit | 4448a571a2ac62748e5216a0b8dd5b862df65a39 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <[email protected]> | Fri Feb 05 14:15:43 2010 -0800 |
| committer | Android Git Automerger <[email protected]> | Fri Feb 05 14:15:43 2010 -0800 |
| tree | 821e85f815701645ade333b7ca04e3477c6fd6eb | |
| parent | c88d03b5156108c92abc3d527d600b7c393fd7c7 [diff] | |
| parent | 520d66ec4145f22ecfd34581ddd52578bd39a964 [diff] |
am 520d66ec: reconcile main tree with open-source eclair Merge commit '520d66ec4145f22ecfd34581ddd52578bd39a964' * commit '520d66ec4145f22ecfd34581ddd52578bd39a964': android-2.1_r1 snapshot