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
This commit is contained in:
Gilles Debunne 2011-02-08 20:41:35 -08:00 committed by Android Git Automerger
commit b30d5f824a

Diff Content Not Available