tree 4c656b7bf37cfb0f071b93bd3140f93d7891df14
parent b19863545ddf5f071926869d92aeb9aa38f2f857
parent ff2c22e2a85eab426c0542947b6cb7dce5f4fb56
author Chris Craik <ccraik@google.com> 1377554727 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377554727 -0700

am ff2c22e2: Merge "Move functor GL setup to just before functor" into klp-dev

* commit 'ff2c22e2a85eab426c0542947b6cb7dce5f4fb56':
  Move functor GL setup to just before functor