am 2b3970a2: Merge change Idc1396c8 into eclair

Merge commit '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-mr2

* commit '2b3970a2956152a508254aa2675b68df363d46c1':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
tree: 425f5c3e143fea8aca48ef51b89089eba7040cb5
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE