tree d999a03b4eb1d5511c30f9f560e0f6b56806cdd0
parent eec2eaa4898829df3793fb2153c0fa9656f6faa2
parent bbe41b551cc5e8d183a547962c552e1382065f89
author Mike Cleron <mcleron@google.com> 1257812167 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257812167 -0800

am bbe41b55: Merge change I4bd71b0f into eclair

Merge commit 'bbe41b551cc5e8d183a547962c552e1382065f89' into eclair-mr2

* commit 'bbe41b551cc5e8d183a547962c552e1382065f89':
  Fix http://b/issue?id=2203681