tree a6ec91738db2ab7f43e0bbba4353432c495d5777
parent 83c992aca4c3b4c927a5d22c02306ab29cfe8ac3
parent 4c9a208262a1fc9ba062d21b8c6c787b8a822991
author Jason Sams <rjsams@android.com> 1263423260 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1263423260 -0800

Merge "Remove excessive logging, fix error in GLSL uniform generation."