tree c6afb072a922fc0cc6b275b9ecb621dd62d54ea7
parent c85e7090ea3a07248d026bfc9db33debd88b1500
parent fe990768e5d6019da8b16abe94a67246b9de54df
author Grace Kloba <klobag@google.com> 1262719218 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1262719218 -0800

am 106f9b24: Patch from Huahui Wu.

Merge commit '106f9b244633171ab75dd98b9761b7137c1a4705' into eclair-mr2-plus-aosp

* commit '106f9b244633171ab75dd98b9761b7137c1a4705':
  Patch from Huahui Wu.