am 5a9d2737: am b6a2256e: Merge "Fix issue 3126094." into gingerbread

Merge commit '5a9d2737181768a1da54d4e7fb00a6b1b86b3860'

* commit '5a9d2737181768a1da54d4e7fb00a6b1b86b3860':
  Fix issue 3126094.
tree: c82bf31e1d6d35b30c92897d26d2680b7fa10d4a
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE