| commit | 34e6991c976f5253bbbd2a1ff4464b71949c9e49 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:14:46 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:14:46 2010 -0800 |
| tree | 6848692fe7de36f68b938e62e41e1e596eda94ca | |
| parent | 2721fbd20844b40778090e295d7fb90abca30f51 [diff] | |
| parent | 1db874720a58ff7e3684116d59ad08bc73db26d9 [diff] |
am 1db87472: am ba8bfedd: reconcile main tree with open-source eclair Merge commit '1db874720a58ff7e3684116d59ad08bc73db26d9' * commit '1db874720a58ff7e3684116d59ad08bc73db26d9': android-2.1_r1 snapshot