tree c4206163e88e1227e4eca4ebf32074df54ec9839
parent 4865519fb17bc38732621183ee62a9e9bf3f4d2c
parent abb8f3b8ecef5688d1e5c29aad9bac4cd389940c
author Torne (Richard Coles) <torne@google.com> 1389095493 +0000
committer Torne (Richard Coles) <torne@google.com> 1389095493 +0000

Merge third_party/skia/include from https://chromium.googlesource.com/a/external/skia/include.git at abb8f3b8ecef5688d1e5c29aad9bac4cd389940c

This commit was generated by merge_from_chromium.py.

Change-Id: I0b728b0eb9377f050e8f35ca9d22c6818d1094cb