commit | eb378d7fd8f94e6a9476a0f0335079612a8acb28 | [log] [tgz] |
---|---|---|
author | Daisuke Miyakawa <dmiyakawa@google.com> | Wed Nov 11 17:09:39 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 11 17:09:39 2009 -0800 |
tree | 3da062fcc396979b70df674ed54a91c7b8e4cc7e | |
parent | 5eca943b978fbbca904994afeca78a0f2bf34ad5 [diff] | |
parent | ea3ba43a3e544244529a1b937d693ebe299ab0b5 [diff] |
am fe17db4c: (-s ours) Merge change I4db11d50 into eclair Merge commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9' into eclair-mr2 * commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9': Backport the change I30b141a2 from MR2 to MR1. Do not merge.