am 60238734: am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread

* commit '6023873463331d30b7ed12942c3323f1b6975ed8':
  Another stab at fixing issue #3149290 java.lang.RuntimeException:...
tree: 33b7b6b8c6f59849cade563b8180b690412bd101
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE