Reconcile with gingerbread-release

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