resolved conflicts for merge of cbf26fd3 to master

Change-Id: I1feb7266c1d5cdebbfb8b8fa0d87d986953a20b6
2010-05-14 15:49:42 -07:00
parent aa8da3dc40 cbf26fd3bc
commit 963b0cdbaf
1 changed files with 1 additions and 1 deletions
--- a/libs/rs/rsProgram.cpp
+++ b/libs/rs/rsProgram.cpp
@@ -195,7 +195,7 @@ bool Program::loadShader(Context *rsc, uint32_t type)

    if (rsc->props.mLogShaders) {
        LOGV("Loading shader type %x, ID %i", type, mShaderID);
-        LOGV(mShader.string());
+        LOGV("%s", mShader.string());
    }

    if (mShaderID) {