tree ac3fbc6f8865f7adb614addfb29f4814027afdac
parent cef3e5efac91256c1f2ca748d38f3851322d802e
parent 2f8d8f8b6d7acd9d0ebdc0a35f25fbb41999a37f
author Android Chromium Automerger <chromium-automerger@android> 1375186936 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1375186936 +0000

Merge third_party/skia/include from https://chromium.googlesource.com/external/skia/include.git at 2f8d8f8b6d7acd9d0ebdc0a35f25fbb41999a37f

This commit was generated by merge_from_chromium.py.

Change-Id: I5a60db7f05da0f6ac0cab03c208e4e079dd3aad9