| commit | c212d9d76fdb5f24e50f4d3e1f463f739335e8a7 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:09:58 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:09:58 2010 -0800 |
| tree | 7b58fd9d7e3a1979a20b21e638c2fa7c7026fc93 | |
| parent | ee4e57e94903f497c936aa23e474e26ba74182c5 [diff] | |
| parent | e879c389cf9bbbba209a35dc9c9b152489482711 [diff] |
am e879c389: am be0a1d3b: reconcile main tree with open-source eclair Merge commit 'e879c389cf9bbbba209a35dc9c9b152489482711' * commit 'e879c389cf9bbbba209a35dc9c9b152489482711': android-2.1_r1 snapshot