| commit | e879c389cf9bbbba209a35dc9c9b152489482711 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:38:43 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:38:43 2010 -0800 |
| tree | f77f26e42117df22de602dc695dfd9e3541bc11c | |
| parent | e6d60500e77f34f627c1c7bb5d3b52d1741f12ef [diff] | |
| parent | be0a1d3b7677d08b928479cfa4fa16b734183ec9 [diff] |
am be0a1d3b: reconcile main tree with open-source eclair Merge commit 'be0a1d3b7677d08b928479cfa4fa16b734183ec9' into eclair-plus-aosp * commit 'be0a1d3b7677d08b928479cfa4fa16b734183ec9': android-2.1_r1 snapshot