am 61a9a83a: am 40226da7: am f4994b3e: Merge "fix bug 5911175" into ics-mr1

* commit '61a9a83ac09246f815806fa4f64cc65a7e876f96':
  fix bug 5911175
tree: 4ea6997ff3c07628f760bf7d6f9de00dcc6606a2
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE