| commit | 42f2013ae61e1f87258443341ed5325b3f18280d | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Mon Jul 25 11:08:17 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 25 11:08:17 2011 -0700 |
| tree | e501a8b03d680c940a6c706fb683d6a518ab1ed7 | |
| parent | 69fe1768a556374d2aad22d870dfb65bcf7f3bc1 [diff] | |
| parent | e2d74651f96c7d27332a3c6559df0c303e40af9f [diff] |
Merge "Remove name collisions in the vertex and fragment shader" into honeycomb-mr1