| commit | efe5fc95a5f8d958df2e55be2379c32b094f2bca | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:17:14 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:17:14 2010 -0800 |
| tree | d9e7ada3abebfe3be7db955055e459283ac36e01 | |
| parent | 735a38d2d8e1db56d91b7b754b540f8643223493 [diff] | |
| parent | 9df17a63e52390bd56b955611cdde28ca8e231ef [diff] |
am 9df17a63: am 066e5308: reconcile main tree with open-source eclair Merge commit '9df17a63e52390bd56b955611cdde28ca8e231ef' * commit '9df17a63e52390bd56b955611cdde28ca8e231ef': android-2.1_r1 snapshot