tree cfce567992ca83d24fb01db9afe96541e12d9f3a
parent 984ccfa1714e2bd556fecc50be4801a27e324e81
parent 9e0dba41bfa5f2029618958a7c2fcfa12e1723ad
author David Turner <digit@android.com> 1312909588 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312909588 -0700

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

* commit '9e0dba41bfa5f2029618958a7c2fcfa12e1723ad':
  opengles emulator: Call XInitThreads on Linux.