am a4aa677d: am b263450f: am 3662f9ee: Merge change Ide4c8cbc into eclair

Merge commit 'a4aa677db36651e806f38e8aa7e8532da4f06b0d'

* commit 'a4aa677db36651e806f38e8aa7e8532da4f06b0d':
  fix [2151588] glTexSubImage2D() allows pixel format conversion
tree: 6a99ace311f7f21eb92f3c3875dbbd3e927b6f77
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE