tree 6296f63e26bdf5eb3edb0fc7ea96943338cd1c80
parent 3ae7a0c0307c528d80ab8efbbd5113b928469a5d
parent 56f46abdcdb6ad65225e5e8ff5b0ccae8d9bacce
author Chris Craik <ccraik@google.com> 1402006971 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402006971 +0000

am 8632b85b: Merge "Fix issues around GL on incorrect thread" into lmp-preview-dev

* commit '8632b85b3ceca1b64ca37843ffd87bc10f4ae72f':
  Fix issues around GL on incorrect thread