Merge change 26081 into eclair

* changes:
  workaround for [2113743] Sholes: frozen then runtime restart going to list view
tree: 57b56f0c3df7489861197c5cfbe8ef48b923256b
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE