am 9e4c8561: Merge change I8d48149c into eclair

Merge commit '9e4c85614c861f095131ffa76e65cbba55d03d0a' into eclair-mr2

* commit '9e4c85614c861f095131ffa76e65cbba55d03d0a':
  Don't reinflate search bar when dialog is already showing
tree: 88d7a8ce2a5e5ed0ceee6e2cf6a7cdf12ee626f7
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE