am d7e80b9d: Merge "fix NPE in getSearchBox" into honeycomb-mr1

* commit 'd7e80b9d5046603ac4a36ea74e204a2ad70a4dca':
  fix NPE in getSearchBox
tree: a14464123bebfff64910d7c44b1759a699a6caa8
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE