tree 625ba25573f19bd88b109967fb7872e37f311247
parent c4e4ba87bba41f414ba268a42c1751263480057a
parent 0652403155dd43f112d1de3de7171877d390be8e
author David Turner <digit@android.com> 1312904658 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312904658 -0700

am 06524031: Merge "opengles emulator: Call XInitThreads on Linux."

* commit '0652403155dd43f112d1de3de7171877d390be8e':
  opengles emulator: Call XInitThreads on Linux.