tree b541f690c964d8bce9562a93203dd7aeb5ad909b
parent fd23eca5ba30a1624233c9597f8c4b9db790994b
parent 9ab2d1847552aa4169b4325aae1b1368d6947a9f
author Chris Craik <ccraik@google.com> 1374535878 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1374535880 +0000

Merge "Ensure glActiveTexture is cleaned up correctly on functor resume"