| commit | b3c80626606fd3cad8df7e34d48832bddaead8cd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:22:08 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:22:08 2010 -0800 |
| tree | 0c9f1b6cffa2739ddc7ba71ecd164c64ea2539ec | |
| parent | fdbc8f3785a4c097a086b2dcfbfcb2d1188cb331 [diff] | |
| parent | a72b39349e48c24aa312c6fa7f1721563733b35d [diff] |
am a72b3934: reconcile main tree with open-source eclair Merge commit 'a72b39349e48c24aa312c6fa7f1721563733b35d' into eclair-plus-aosp * commit 'a72b39349e48c24aa312c6fa7f1721563733b35d': android-2.1_r1 snapshot