am 964faa35: am 3f3afbef: Reconcile with ics-mr1-release

* commit '964faa351815a86cf6832f261e71daf48af3d5c6':
tree: b161932009f38f8fd794d92d852fc1f931ed8c1e
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE