commit | f647b76060c4dc2a90777edeff326a26f75a4212 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:47:36 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:47:36 2010 -0800 |
tree | cfbac5189d983a7c7d05539fc972a86738d4ebe1 | |
parent | 0355fc3108a9995dd2ddbe132c7a73ceb2c9c139 [diff] | |
parent | 9215898d31a481aa04ac491b17438f366a6e8f52 [diff] |
am 9215898d: reconcile main tree with open-source eclair Merge commit '9215898d31a481aa04ac491b17438f366a6e8f52' into eclair-plus-aosp * commit '9215898d31a481aa04ac491b17438f366a6e8f52': android-2.1_r1 snapshot