| commit | bae6e6fddb97f90cb1d71e748d5507f694356135 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:11:42 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:11:42 2010 -0800 |
| tree | e040480b6f414874813b1bcbb4653c7003f8fef4 | |
| parent | 6ac94e9eb27717b1e282298172ebabb524de7058 [diff] | |
| parent | 7643a1fcce0798ff46f485759f4527e5c8067ba7 [diff] |
am 7643a1fc: am bff01c69: reconcile main tree with open-source eclair Merge commit '7643a1fcce0798ff46f485759f4527e5c8067ba7' * commit '7643a1fcce0798ff46f485759f4527e5c8067ba7': android-2.1_r1 snapshot