commit | 49fc4a9dd39e520d87fd2b9f1a20263570221ebe | [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 | 49061c792a5f21011de4330cb3b0d004ac483755 | |
parent | e871be666b80d3f6a9a9a44ee400ab661be212e4 [diff] | |
parent | fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9 [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.