| commit | 6690f6d90a6df66c835b0dd59518ae9fe444dc29 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:08:41 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:08:41 2010 -0800 |
| tree | 226811d02b61d50567a9055112b203e4452a1780 | |
| parent | c71e770495e0b4597b4b3d947cbc68a0d35051be [diff] | |
| parent | 85a199447d42a52efe81badb28bcecc440a3bfb2 [diff] |
am 85a19944: am 46200b0f: reconcile main tree with open-source eclair Merge commit '85a199447d42a52efe81badb28bcecc440a3bfb2' * commit '85a199447d42a52efe81badb28bcecc440a3bfb2': android-2.1_r1 snapshot