commit | ea0343767d65b462a4215a0b6aed9e3a76063098 | [log] [tgz] |
---|---|---|
author | Mathias Agopian <mathias@google.com> | Fri Feb 03 15:37:55 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 03 15:37:55 2012 -0800 |
tree | fb2cbad79ed324f0a83365eb6df90ed07da4683f | |
parent | 0b1ad704f4d66219e4b0e1e87947b4d004d3414f [diff] | |
parent | 4d10ed3210ef6beb28f525d1a064268b149f0736 [diff] |
am 4d10ed32: Merge "fix a dead-lock in eglMakeCurrent" * commit '4d10ed3210ef6beb28f525d1a064268b149f0736': fix a dead-lock in eglMakeCurrent