am 902051df: Merge change I0e27b5ca into eclair

Merge commit '902051dfa7590f8b2c22eb0a46df80f1bf19a087' into eclair-mr2

* commit '902051dfa7590f8b2c22eb0a46df80f1bf19a087':
  Fix texture upload bug for narrow texture of less than 32bpp.

libs/rs/rsAllocation.cpp

@@ -104,6 +104,7 @@ void Allocation::uploadToTexture(uint32_t lodOffset)
         glGenTextures(1, &mTextureID);
     }
     glBindTexture(GL_TEXTURE_2D, mTextureID);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
     Adapter2D adapt(getContext(), this);
     for(uint32_t lod = 0; (lod + lodOffset) < mType->getLODCount(); lod++) {