| commit | adf0c6897025e4d6e75847b0f03721b0210e1237 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:19:17 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:19:17 2010 -0800 |
| tree | a73d218bd3214bc5e32d4cf35944895b77bcca13 | |
| parent | 808f34a8cab52569bfca26cec6fd96740aa2ea25 [diff] | |
| parent | 246e25ae64e562d40328574156fa48f626631dcf [diff] |
am 246e25ae: am 0b3736b3: reconcile main tree with open-source eclair Merge commit '246e25ae64e562d40328574156fa48f626631dcf' * commit '246e25ae64e562d40328574156fa48f626631dcf': android-2.1_r1 snapshot