| commit | 7ff37ada138d9023e9d646f7195ae761a7b83ff2 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Mon Aug 26 15:05:27 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 26 15:05:27 2013 -0700 |
| tree | 4c656b7bf37cfb0f071b93bd3140f93d7891df14 | |
| parent | b19863545ddf5f071926869d92aeb9aa38f2f857 [diff] | |
| parent | ff2c22e2a85eab426c0542947b6cb7dce5f4fb56 [diff] |
am ff2c22e2: Merge "Move functor GL setup to just before functor" into klp-dev * commit 'ff2c22e2a85eab426c0542947b6cb7dce5f4fb56': Move functor GL setup to just before functor