| commit | 85a199447d42a52efe81badb28bcecc440a3bfb2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:22:26 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:22:26 2010 -0800 |
| tree | 25545f67b6fea81d71b9d377933dcefff6e950e2 | |
| parent | 18c04ffa782657f8c3ab7f53bc6fe482a305c76f [diff] | |
| parent | 46200b0ff3820983c84616c78c1378db9b7022a5 [diff] |
am 46200b0f: reconcile main tree with open-source eclair Merge commit '46200b0ff3820983c84616c78c1378db9b7022a5' into eclair-plus-aosp * commit '46200b0ff3820983c84616c78c1378db9b7022a5': android-2.1_r1 snapshot