am aeaf2830: (-s ours) am e69b2860: Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread

Merge commit 'aeaf2830f5ab81e6f95062514239081af65a914f'

* commit 'aeaf2830f5ab81e6f95062514239081af65a914f':
  DO NOT MERGE Removed "Stop selecting text" option.