am 01427d12: am c86fa4b8: Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)"

* commit '01427d12868d5943cb80d430c2bcecd535b2c977':
  opengles emulator: support NULL as parameter to glTexImage2D (gles1)