am 7069f7c0: (-s ours) am 816dd3d4: (-s ours) resolved conflicts for merge of...
am 7069f7c0: (-s ours) am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp
* commit '7069f7c0':
Double tap on a word no longer opens context menu. DO NOT MERGE