am 246a1bee: am edfc6a0d: am f4994b3e: Merge "fix bug 5911175" into ics-mr1

* commit '246a1bee9d5db1db3c91e0886b514598763193dd':
tree: 4ea6997ff3c07628f760bf7d6f9de00dcc6606a2
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE