| commit | d8d53d7d98d3a7924433f48a7e4aa896c6f51e4a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:08:38 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:08:38 2010 -0800 |
| tree | 80b3d5cf91a9b2a5a30585b9699d0ac10e131702 | |
| parent | bbb8c49cedc75e424805f3a13656861ae203f5f1 [diff] | |
| parent | 280dd0135a308847cc881dbf3feb5b1145158206 [diff] |
am 280dd013: am 5c26a1c0: reconcile main tree with open-source eclair Merge commit '280dd0135a308847cc881dbf3feb5b1145158206' * commit '280dd0135a308847cc881dbf3feb5b1145158206': android-2.1_r1 snapshot