tree fb20494e1e0dc784fa2580fb47114f3e29ee54ad
parent 5c9f35799422d818f34f814c76c2acd8c939a40c
parent 25945ca2e67c0e46ff2ad46590cd71ca5b4b4266
author Adam Powell <adamp@google.com> 1284763567 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284763567 -0700

am 25945ca2: Merge "Fix silly touch bug in TextView. Oops." into gingerbread

Merge commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266' into gingerbread-plus-aosp

* commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266':
  Fix silly touch bug in TextView. Oops.