tree 1e9281525b6840316aa65adde0fe07cc93c774c2
parent 27369891df5b567113ad1f28e5044a9b414a810b
parent 408cb61cd625026f204980897f638ed6ba3cf3e8
author Android Chromium Automerger <chromium-automerger@android> 1399282656 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1399282656 +0000

Merge third_party/skia/include from https://chromium.googlesource.com/external/skia/include.git at 408cb61cd625026f204980897f638ed6ba3cf3e8

This commit was generated by merge_from_chromium.py.

Change-Id: I257aa35320638c9cd19f88b14623b08774d5a2b5