am 1ed0e43d: am 93942a5b: am 69fba87a: Merge change I6fc56997 into eclair

Merge commit '1ed0e43dac155db048ccc9152dc9425506099957'

* commit '1ed0e43dac155db048ccc9152dc9425506099957':
  fix [2187212] add support for GLESv2 dispatch based on TLS
tree: 99fc6f5ca528aff0435aca60a0ff02392c78aaa1
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE