tree 55c3aa1bb64fb7d5886dcfeeae34ffad7206e34d
parent 0ff5e20989c08af62db69ce7ace1d756d482f08b
parent 23820f6a8969f99722cb32d3ddf243d103af01a9
author Gilles Debunne <debunne@google.com> 1297378082 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297378082 -0800

am aff2cfd1: resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp

* commit 'aff2cfd14b3d37a22b2d6b1ba72b52c6a80a12b3':
  Text selection is broken.