| commit | b666c6cfdf5d240ed4c8067acf81047a9673a66b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:15:51 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:15:51 2010 -0800 |
| tree | 04359f4ebe4627538d5422c62577bd5c006c2be0 | |
| parent | ca85a326ba31367965d0fe32f75045d71ce6c467 [diff] | |
| parent | f6e474fa09819f915010bd81504cd31ea5afae6a [diff] |
am f6e474fa: am 5cc97856: reconcile main tree with open-source eclair Merge commit 'f6e474fa09819f915010bd81504cd31ea5afae6a' * commit 'f6e474fa09819f915010bd81504cd31ea5afae6a': android-2.1_r1 snapshot