am 8a2f3ecc: am 25503f1c: Merge from gingerbread

* commit '8a2f3ecc030512b6813ee2bb8c56b77280cad7c5':
tree: f07d2aa647069e9ad51d10616344b8865a2d715f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE