| commit | 2e068dc33053970c2d58984ee182058bdac950db | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:09:04 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:09:04 2010 -0800 |
| tree | ca53b4adbf66388805a47f93c440412be552761c | |
| parent | e08991e02a7d678f2574e85289a34b2a9a537c82 [diff] | |
| parent | da846fcf1b6a7bbd2f9f30c965b25f084568ef75 [diff] |
am da846fcf: am 4c382b13: reconcile main tree with open-source eclair Merge commit 'da846fcf1b6a7bbd2f9f30c965b25f084568ef75' * commit 'da846fcf1b6a7bbd2f9f30c965b25f084568ef75': android-2.1_r1 snapshot