am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp

Browse Source

* commit '816dd3d443108b473965f97123eef7300f53615f':
  Double tap on a word no longer opens context menu. DO NOT MERGE

...

This commit is contained in:

Gilles Debunne 2011-03-14 13:41:14 -07:00 committed by Android Git Automerger

parent 00ff0ca922 4feb59c624

commit b66cc3d5fc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available