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

* commit '816dd3d443108b473965f97123eef7300f53615f':
  Double tap on a word no longer opens context menu. DO NOT MERGE
tree: aab456746a87080f3777cd2506e94fae18f43931
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE