Merge "Add function to map GL compressed tex format to tcu."
authorMika Isojärvi <misojarvi@google.com>
Fri, 9 Jan 2015 00:15:07 +0000 (00:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Jan 2015 00:15:08 +0000 (00:15 +0000)
1  2 
framework/opengl/gluTextureUtil.cpp
framework/opengl/gluTextureUtil.hpp

Simple merge
Simple merge