tree 1b06965d57757af864f24ad4ad667f84eefb7eda
parent d0225ee63f305ef59e17f8ad0dc16b2ef5e85af0
parent 2276398db0b0208b7627dc436ecc9e6c09e68107
author vchtchetkine <vchtchetkine@google.com> 1260735811 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260735811 -0800

am 2276398d: Merge change I0d9344aa into eclair

Merge commit '2276398db0b0208b7627dc436ecc9e6c09e68107' into eclair-mr2

* commit '2276398db0b0208b7627dc436ecc9e6c09e68107':
  Fixed