| commit | 1abc6e8868de805bdf1d80f4253657e52cf1a291 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:21:53 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:21:53 2010 -0800 |
| tree | 11849709456decba14c76cf274e4dcc72cab5784 | |
| parent | 3ed4ae613b89ab29ac8c801e30a98ffc7c6007e1 [diff] | |
| parent | 1cd49f1559cf2c3b0cb1294b3787c5ddb3562c8d [diff] |
am 1cd49f15: am e2b8d31c: reconcile main tree with open-source eclair Merge commit '1cd49f1559cf2c3b0cb1294b3787c5ddb3562c8d' * commit '1cd49f1559cf2c3b0cb1294b3787c5ddb3562c8d': android-2.1_r1 snapshot