| commit | ad7e6ffdad535aa083bcaadd54b077dcc07d1b91 | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@google.com> | Tue Nov 22 12:35:25 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 22 12:35:25 2011 -0800 |
| tree | 9ef07dd0fc2d70fbadd2cbb147b8ae5c9cdadfe6 | |
| parent | 4b557dd2eca0c1cf0a0d5693c503c213604dcb40 [diff] | |
| parent | a67d4d23e55123efffcb5964d5e9b1de688bc95f [diff] |
am 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1 * commit '303a0695b8fa0b8f0095c437145a28633a7a8d92': Draw in the correct FBO after invoking a GL functor Bug #5650514