| commit | cc4d7d89e9d47a5b6e0bc00881f60bb619d32714 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:38:49 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:38:49 2010 -0800 |
| tree | a5d3ea486b907c77abd820d7df12fb224ed0a417 | |
| parent | 2d6e68563e4d0edadae3458f012ebb59de587c32 [diff] | |
| parent | 5bbcf18ea3e31cae5012ce26565daa0a21d89d95 [diff] |
am 5bbcf18e: reconcile main tree with open-source eclair Merge commit '5bbcf18ea3e31cae5012ce26565daa0a21d89d95' into eclair-plus-aosp * commit '5bbcf18ea3e31cae5012ce26565daa0a21d89d95': android-2.1_r1 snapshot