tree 366730b0d4af8470531d69e1e6d29720e0ff1ec5
parent 8634b9ca0f103b1f264c3ae25392419f9a00e979
parent 23aa34a743ae18e0d45b459f0c7010eb47a2147a
author Mathias Agopian <mathias@google.com> 1258676964 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258676964 -0800

am 23aa34a7: Merge change I137dac6f into eclair

Merge commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-plus-aosp

* commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a':
  backout a workaround that is not needed anymore