tree 68502a20e297f4dab20c32d2b6d4f9a614d1a99f
parent a0513574069404eb47e6c43b3eaf54e0889ddebc
parent 010fccb0637f8a69a35ee1a7feb228d213f6d542
author Mathias Agopian <mathias@google.com> 1274939343 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1274939343 -0700

Merge "minor clean-up GLclampx -> GLclampf" into kraken