| commit | 7dc5153994ba1c6506dbf98513269dd65bf95c37 | [log] [tgz] |
|---|---|---|
| author | Siva Velusamy <vsiva@google.com> | Fri Mar 20 22:17:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 22:17:06 2015 +0000 |
| tree | 6f2d36068f5c6bd629645a735d098080de764a8a | |
| parent | 2b1c8636b873d7fbe07c697532b3bbcdd2681da9 [diff] | |
| parent | 9b41c2c1de9fd4d2677123a2b0e52aa823b7aaa0 [diff] |
am 9b41c2c1: am 5131332b: Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS" into idea133 automerge: 4d05f33 * commit '9b41c2c1de9fd4d2677123a2b0e52aa823b7aaa0': gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS