am d485c76b: am c8e8a12b: Merge "Fix issue #3289835: NullPointerException in..." into gingerbread

* commit 'd485c76b5e09a8c311f8f129cbe5ec75499556be':
  Fix issue #3289835: NullPointerException in...
tree: b6514877dba7dfbff737216ae02e6ae2335a3585
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE