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

Merge commit '93942a5bbc27fe569d370b57a0c3137f6c4171f7' into eclair-mr2-plus-aosp

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