| commit | 22c534ac2dc427dd98e414b816dca2d86d0044b9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:16:15 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:16:15 2010 -0800 |
| tree | 3a0955c356258c55ad517378c819ba1e4927fd47 | |
| parent | 0f28cd7d2d4967ce9a796497387e8dbfd19666c6 [diff] | |
| parent | fec2448d0bfef2b3f1e1db5d1c0e1397829293fe [diff] |
am fec2448d: am 26b4f918: reconcile main tree with open-source eclair Merge commit 'fec2448d0bfef2b3f1e1db5d1c0e1397829293fe' * commit 'fec2448d0bfef2b3f1e1db5d1c0e1397829293fe': android-2.1_r1 snapshot