| commit | 815fbbdfca52c37f251f156122b5537a9b9807e9 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Mon Aug 26 15:12:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 26 15:12:06 2013 -0700 |
| tree | 7b26ac3a028f3e434a083f4937cfb3a56028dc5f | |
| parent | 84ba33acf9eba178bddf06159fa974e13a9b76d5 [diff] | |
| parent | 7ff37ada138d9023e9d646f7195ae761a7b83ff2 [diff] |
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