tree d999a03b4eb1d5511c30f9f560e0f6b56806cdd0
parent 6b4e9fd4a30c2e6a0c0f102a09dc833717f8289d
parent b6f23a6cbcdf627081b5486e002944af617ecddb
author Mike Cleron <mcleron@google.com> 1257812486 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257812486 -0800

am b6f23a6c: am bbe41b55: Merge change I4bd71b0f into eclair

Merge commit 'b6f23a6cbcdf627081b5486e002944af617ecddb' into eclair-mr2-plus-aosp

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