| commit | f5cf93b9d8a74025b93fcface0596749b466b7a7 | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@google.com> | Tue Nov 22 12:42:06 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 22 12:42:06 2011 -0800 |
| tree | 3e20c0cffe208a84843bab653b4af0aace91af2c | |
| parent | 8920e57e06ad5b063d2abe037da4c27478317a14 [diff] | |
| parent | ad7e6ffdad535aa083bcaadd54b077dcc07d1b91 [diff] |
am a2fabf4a: am 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1 * commit 'a2fabf4a109d46f99ff7370aa05e48c1708c2838': Draw in the correct FBO after invoking a GL functor Bug #5650514