| commit | 8fe40e09a5488b39bba460caccd685d907a78bd1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:15:27 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:15:27 2010 -0800 |
| tree | 74e4fa8f04fb0f7f8634e47a6ada7a35f4eaa0ec | |
| parent | fcc21f46aeca27a74898c1d111f4e153001db2a2 [diff] | |
| parent | 196be3b6348f4a6c975d25dbee135fc3952e0ac7 [diff] |
am 196be3b6: am 8411d87e: reconcile main tree with open-source eclair Merge commit '196be3b6348f4a6c975d25dbee135fc3952e0ac7' * commit '196be3b6348f4a6c975d25dbee135fc3952e0ac7': android-2.1_r1 snapshot