tree 7b26ac3a028f3e434a083f4937cfb3a56028dc5f
parent 84ba33acf9eba178bddf06159fa974e13a9b76d5
parent 7ff37ada138d9023e9d646f7195ae761a7b83ff2
author Chris Craik <ccraik@google.com> 1377555126 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377555126 -0700

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

* commit '7ff37ada138d9023e9d646f7195ae761a7b83ff2':
  Move functor GL setup to just before functor