am 5d4b1f50: am c4b10a54: Merge "emulator opengl: Added glFinishRoundTrip implementation."

* commit '5d4b1f504219e4c5b9028fa45640b31f61862e7c':
  emulator opengl: Added glFinishRoundTrip implementation.