tree c217870091ea58a2903ccbbd119cdcc881c2a4eb
parent cc829a652ba3c0caaca8a6bdbab1c3385fa49c83
parent 9aaf01b9d03e931c9d37858562ea47dbaf44a3be
author Mathias Agopian <mathias@google.com> 1258681520 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258681520 -0800

am 9aaf01b9: am 793810f6: am 23aa34a7: Merge change I137dac6f into eclair

Merge commit '9aaf01b9d03e931c9d37858562ea47dbaf44a3be'

* commit '9aaf01b9d03e931c9d37858562ea47dbaf44a3be':
  backout a workaround that is not needed anymore