tree d6ca9b5252b4e512db4256e6336a928604a234e2
parent 0a8bfd1b3b81ce50bb38a54644554b95db7744b0
parent 4fd30641a9a82ae3bfbc59473e8ea4e9691a7c39
author Gilles Debunne <debunne@google.com> 1297226495 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297226495 -0800

am 4fd30641: Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit '4fd30641a9a82ae3bfbc59473e8ea4e9691a7c39':
  Double tap triggers text selection in a TextView. DO NOT MERGE