Merge "Linear blending, step 1"

diff --cc core/jni/android/graphics/Bitmap.cpp
Simple merge

diff --cc core/jni/android/graphics/GraphicsJNI.h
index 4c6a384,34c4efb..e5af525
--- 1/core/jni/android/graphics/GraphicsJNI.h
--- 2/core/jni/android/graphics/GraphicsJNI.h
+++ b/core/jni/android/graphics/GraphicsJNI.h
@@@ -10,9 -10,9 +10,10 @@@
  #include "SkMallocPixelRef.h"
  #include "SkPoint.h"
  #include "SkRect.h"
+ #include "SkColorSpace.h"
  #include <jni.h>
  #include <hwui/Canvas.h>
 +#include <hwui/PixelRef.h>
  
  class SkBitmapRegionDecoder;
  class SkCanvas;

diff --cc libs/hwui/Android.mk
Simple merge

diff --cc services/core/jni/Android.mk
Simple merge