tree da6f93d1faa317345ae712cb4ec1bae8ab809f2a
parent 436dc98c3d8f803e3f14cdc1193048240c7a31e7
parent dba6bd45f8a7398d217c6418211dfc9d2c34966d
author David Turner <digit@android.com> 1313506493 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1313506493 -0700

am dba6bd45: am ca7a7b05: Merge "opengles emulator: use bionic tls slot"

* commit 'dba6bd45f8a7398d217c6418211dfc9d2c34966d':
  opengles emulator: use bionic tls slot