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

* commit 'cbf73e7bfadd3c94fceb5afc6e51fc800acbf681':
  emulator opengl: Added glFinishRoundTrip implementation.