am 89bc1395: Merge "Add more error checking for ndc" into froyo

Merge commit '89bc1395748a0a139db82adbf01166ed6fa79766' into froyo-plus-aosp

* commit '89bc1395748a0a139db82adbf01166ed6fa79766': (392 commits)
  Add more error checking for ndc
  Add javadoc for camera scene modes.
  more clean-up in preparation of bigger changes
  Fix a typo in Singleton<>
  Avoid copying for input recording frames in CameraSource
  Add video frame parameter.
  more clean-up of Surfaceflinger's client management
  Better sniffing of MPEG4 content by checking for a compatible sub-brand.
  Remove the logic in CameraSource using CameraParameters class to find out the buffer size.
  Add support for gps altitude EXIF tags.
  minor clean-up GLclampx -> GLclampf
  clean-up dead-code
  Make sure to use filtering while in fixed-size mode
  oopsie. forgot to displatch SET_BUFFERS_GEOMETRY
  Avoid repeatedly allocating and freeing memory in CameraSource
  After failing to create an AudioTrack, only stop the source if we were the ones starting it.
  Convert a number of assertions into runtime errors (OggExtractor)
  fix [2712278] The preview buffer left some black borders in left and bottom edges
  Fix 2667859: change text back to default size
  Support for thumbnail extraction in the Matroska extractor.
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/libs/rs/rsProgram.cpp b/libs/rs/rsProgram.cpp
index 478a6dcbcc21..70e2868bc336 100644
--- 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) {