| commit | fec2448d0bfef2b3f1e1db5d1c0e1397829293fe | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:45:35 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:45:35 2010 -0800 |
| tree | 5406cd6fa42489be6088ce490709b3534d69adc5 | |
| parent | 50b1150a777a4b0203cdce881d0f11e93f25026c [diff] | |
| parent | 26b4f9189c192ab62ddfa300b8c70fccd420d845 [diff] |
am 26b4f918: reconcile main tree with open-source eclair Merge commit '26b4f9189c192ab62ddfa300b8c70fccd420d845' into eclair-plus-aosp * commit '26b4f9189c192ab62ddfa300b8c70fccd420d845': android-2.1_r1 snapshot