am 6aa717e4: (-s ours) am 97e58ef4: Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread

Merge commit '6aa717e4a190cc23f61b93770ee1f80243c0f8e7'

* commit '6aa717e4a190cc23f61b93770ee1f80243c0f8e7':
  DO NOT MERGE Separate utility methods into utility class.
tree: a5b01e7714e08c28da6d945bea0296d013cbaccf
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE