| commit | ad7ab8be4774a4fbb01a50deed52e819549327a7 | [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 | 50a09314e15cdfc935884d996079ea3c29566c37 | |
| parent | 54f32f562b455ddea84ad9b95946a98e6dfb6686 [diff] | |
| parent | db08d5cd441424e4f9621aae7c2414934f781400 [diff] |
am db08d5cd: (-s ours) DO NOT MERGE. Merge commit 'db08d5cd441424e4f9621aae7c2414934f781400' into eclair-mr2 * commit 'db08d5cd441424e4f9621aae7c2414934f781400': DO NOT MERGE.