| commit | 07de91d483e8971589ba395c072807e204d5aa09 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:13:49 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:13:49 2010 -0800 |
| tree | 004c09655fce1048693ebbe34d3a3bfdf94c13e1 | |
| parent | f28cf9518aba6860847cde9171a078021419df0b [diff] | |
| parent | 48ffea93dff6b952b4ad5818b748dadd2dd7c19e [diff] |
am 48ffea93: am cf69b0c7: reconcile main tree with open-source eclair Merge commit '48ffea93dff6b952b4ad5818b748dadd2dd7c19e' * commit '48ffea93dff6b952b4ad5818b748dadd2dd7c19e': android-2.1_r1 snapshot