| commit | 3e22f3c8664410fc29b4df61b81ef6c84ca3c16a | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins <scroggo@google.com> | Wed Dec 02 05:25:12 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 02 05:25:12 2009 -0800 |
| tree | b7bd6938b8c20f41d994ddfa4518f1c345c96472 | |
| parent | abb64629e2aab05af21153a1fa07192d55160999 [diff] | |
| parent | 87029dbc462479fd46ea3150567fdbdfbca94a85 [diff] |
am db08d5cd: (-s ours) DO NOT MERGE. Merge commit 'db08d5cd441424e4f9621aae7c2414934f781400' into eclair-mr2 * commit 'db08d5cd441424e4f9621aae7c2414934f781400': DO NOT MERGE.