am 352b8d03: (-s ours) am 8046e294: Merge "DO NOT MERGE" into ics-scoop

* commit '352b8d03c63585f4eaec09d2e39a4d173be83164':
  DO NOT MERGE
tree: f200e6c9f63d54186a2ecb6ea93f42b819cb41b4
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE