tree a5fe2933c4d414feb549868c29fa2e8fc17efe64
parent 510c489a081dae49f86033ecbf1b6e866c69656c
parent 3a032856e7adc7bbccf165e8c0eeb86a38bdc57b
author Daniel Sandler <dsandler@google.com> 1257988413 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257988413 -0800

am 3a032856: Fix http://b/2248037 .

Merge commit '3a032856e7adc7bbccf165e8c0eeb86a38bdc57b' into eclair-mr2

* commit '3a032856e7adc7bbccf165e8c0eeb86a38bdc57b':
  Fix http://b/2248037 .