Commit e9a7d229 authored Jan 17, 2014 by Chris Craik Committed by Android Git Automerger Jan 17, 2014

am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference"

* commit '66b5a2b2':
  Initialize pointer members to NULL to avoid illegal reference

libs/hwui/SkiaShader.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ struct SkiaBitmapShader: public SkiaShader {
		GLuint* textureUnit);

		private:
		SkiaBitmapShader() {
		SkiaBitmapShader() : mBitmap(NULL), mTexture(NULL) {
		}

		SkBitmap* mBitmap;