commit 5809c1a171f8bf7c5f6e2c107cdd2d074ead6ff6
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Tue Jan 24 21:36:22 2017 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Tue Jan 24 21:36:22 2017 +0000
tree dae3e0848778de87d5780344509ab89f2584f917
parent 25d2303310efbab2838da31f02837c2cf3e671df
parent c4e6cfe56220fd93a7635a98a034a72817a5283b

Merge latest Skia into master (5 commits)

https://skia.googlesource.com/skia.git/+log/5d72f7d..c4e6cfe

Test: Presubmit checks will test this change.
Change-Id: I519211f813552c3d1cc52331769bd62325df0345

Android.bp

diff --git a/Android.bp b/Android.bp
index fcf1520..3cd433a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -450,13 +450,13 @@
         "src/gpu/effects/GrConfigConversionEffect.cpp",
         "src/gpu/effects/GrConstColorProcessor.cpp",
         "src/gpu/effects/GrConvexPolyEffect.cpp",
-        "src/gpu/effects/GrConvolutionEffect.cpp",
         "src/gpu/effects/GrCoverageSetOpXP.cpp",
         "src/gpu/effects/GrCustomXfermode.cpp",
         "src/gpu/effects/GrDisableColorXP.cpp",
         "src/gpu/effects/GrDistanceFieldGeoProc.cpp",
         "src/gpu/effects/GrDitherEffect.cpp",
         "src/gpu/effects/GrGammaEffect.cpp",
+        "src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp",
         "src/gpu/effects/GrMatrixConvolutionEffect.cpp",
         "src/gpu/effects/GrOvalEffect.cpp",
         "src/gpu/effects/GrPorterDuffXferProcessor.cpp",