| commit | c28e574037b2bfc8c2ea24593299aa20ae9078f8 | [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 | 38a75bdcc25887e4c9f2c640227fce4d2635079a | |
| parent | 0ce49783083bf81cc1ea812e029fc94e1625a8fd [diff] | |
| parent | a2fabf4a109d46f99ff7370aa05e48c1708c2838 [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