| commit | 611a83b419666f2117b0a4c5dab24da2528f99cc | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:19:58 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:19:58 2010 -0800 |
| tree | 76b5246ca7433d3c18cfb4a1bb7cd67e63afa4c6 | |
| parent | 530cace41741ee5c04d4e9bfb993d91e5d1f489a [diff] | |
| parent | 9c3119adb14168017aa579d69fbc4b40e451f162 [diff] |
am 9c3119ad: reconcile main tree with open-source eclair Merge commit '9c3119adb14168017aa579d69fbc4b40e451f162' * commit '9c3119adb14168017aa579d69fbc4b40e451f162': android-2.1_r1 snapshot