tree 66dd91c9cd8c00396486552f4c270dc76d456f9d
parent dd35bd30af493711c55e18520cba0aa855806d89
parent fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9
author Daisuke Miyakawa <dmiyakawa@google.com> 1257919572 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257919572 -0800

am fe17db4c: Merge change I4db11d50 into eclair

Merge commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9' into eclair-plus-aosp

* commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9':
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.