Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev am...

author Matt Sarett <msarett@google.com>

Fri, 14 Apr 2017 19:02:54 +0000 (19:02 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 14 Apr 2017 19:02:54 +0000 (19:02 +0000)
author Matt Sarett <msarett@google.com>
Fri, 14 Apr 2017 19:02:54 +0000 (19:02 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 19:02:54 +0000 (19:02 +0000)
diff --cc core/jni/android/graphics/BitmapFactory.cpp
Simple merge
diff --cc libs/hwui/SkiaCanvas.cpp
Simple merge
author	Matt Sarett <msarett@google.com>
	Fri, 14 Apr 2017 19:02:54 +0000 (19:02 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 14 Apr 2017 19:02:54 +0000 (19:02 +0000)
		1	2
core/jni/android/graphics/BitmapFactory.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
libs/hwui/SkiaCanvas.cpp	patch \|	diff1 \|	diff2 \|	blob \| history