| commit | 69393dd0f4849bf4756c71f1b56e37560a00ab90 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:19:11 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:19:11 2010 -0800 |
| tree | 39dc5bd89af811e56f1f5a5fc1e1ab7b1c684c1d | |
| parent | fd6c1aaf237f7bcbbd70a4f68021903c4c005b00 [diff] | |
| parent | b92cd9b6b38e78d68346884d4e9148bd61d0cef0 [diff] |
am b92cd9b6: am 9cd68585: reconcile main tree with open-source eclair Merge commit 'b92cd9b6b38e78d68346884d4e9148bd61d0cef0' * commit 'b92cd9b6b38e78d68346884d4e9148bd61d0cef0': android-2.1_r1 snapshot