am 2f2daf8e: (-s ours) Fix search intent component bug DO NOT MERGE

Merge commit '2f2daf8ed4d45ff68a0aeffcd0b284c45e5a5d82' into eclair

* commit '2f2daf8ed4d45ff68a0aeffcd0b284c45e5a5d82':
  Fix search intent component bug DO NOT MERGE
tree: 864a258efae49883ee0d85b66fbc6ba7201ef098
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE