am ae0bb04a: Merge "Fix issue 3098850" into gingerbread

Merge commit 'ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac' into gingerbread-plus-aosp

* commit 'ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac':
  Fix issue 3098850
tree: 9e635d4ff84ec76907f690e183c1ca1946bc4760
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE