| commit | f12a5c9b12aaa5a45cd8c4b7f77a6eefdf4a85d8 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins <scroggo@google.com> | Wed Dec 02 05:34:39 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 02 05:34:39 2009 -0800 |
| tree | 08a6e31330ec08cc9712a49d0706386985432259 | |
| parent | c7763acabb530950f9af0f487d4834d2ee26ec69 [diff] | |
| parent | ad7ab8be4774a4fbb01a50deed52e819549327a7 [diff] |
am ad7ab8be: am db08d5cd: (-s ours) DO NOT MERGE. Merge commit 'ad7ab8be4774a4fbb01a50deed52e819549327a7' into eclair-mr2-plus-aosp * commit 'ad7ab8be4774a4fbb01a50deed52e819549327a7': DO NOT MERGE.