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

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