| commit | 3a122f96371905dc80e496660f8cc1032d1cf634 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:17:41 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:17:41 2010 -0800 |
| tree | bdcf7a74567b07a433b0e0d6b5f6a2657caa3005 | |
| parent | 7463f0141f0b5346837c747fbb3918e933e97722 [diff] | |
| parent | 0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2 [diff] |
am 0341ac9a: am 8916d261: reconcile main tree with open-source eclair Merge commit '0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2' * commit '0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2': android-2.1_r1 snapshot