commit 5b4e4d9033f3d525ac00b90b601a50bafe2799e3
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Wed Mar 08 18:24:41 2017 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Wed Mar 08 18:24:41 2017 +0000
tree cd4f05c3fdef47db55834b48ec0f0dfc2983b7ee
parent daa2db793a096cd124aa75acc5156134c464d39f
parent c01389271162d08303088732c30f419807f25d33

Merge latest Skia into master (4 commits)

https://skia.googlesource.com/skia.git/+log/b357dea..c013892

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

Android.bp

diff --git a/Android.bp b/Android.bp
index cf1e609..aeeea79 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1038,6 +1038,7 @@
         "gm/fontscaler.cpp",
         "gm/fontscalerdistortable.cpp",
         "gm/gamma.cpp",
+        "gm/gammaencodedpremul.cpp",
         "gm/gammatext.cpp",
         "gm/gamut.cpp",
         "gm/gaussianedge.cpp",
@@ -1905,6 +1906,7 @@
         "gm/fontscaler.cpp",
         "gm/fontscalerdistortable.cpp",
         "gm/gamma.cpp",
+        "gm/gammaencodedpremul.cpp",
         "gm/gammatext.cpp",
         "gm/gamut.cpp",
         "gm/gaussianedge.cpp",