Merge eab0e97b from gingerbread

Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
tree: b60da6c8c40f73796fb700626b8917375c7b4041
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE