| commit | c7104051302c2aab32859df1c55451f37dea1049 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:47:30 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:47:30 2010 -0800 |
| tree | f15163e716ba519dacf9eb102c07ecb27e533103 | |
| parent | 69169b22ae86f2855c52f9ea14f6797b1b44521c [diff] | |
| parent | 1b6d5753bd2f65e387ce1da397cbb022df6d4d51 [diff] |
am a63efa5c: reconcile main tree with open-source eclair Merge commit 'a63efa5cd15b125d7683cc5afb904e13503557a3' into eclair-plus-aosp * commit 'a63efa5cd15b125d7683cc5afb904e13503557a3': android-2.1_r1 snapshot