tree 52f694d3334bedaef7fb91d00beaca766403a3d3
parent 0ffbc548eea1f2bace29697d3e9040a9f8daa521
parent 131e138f57d72cde1c1549ba33301b2d5ea5c3e9
author Android Chromium Automerger <chromium-automerger@android> 1399051843 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1399051843 +0000

Merge third_party/skia/include from https://chromium.googlesource.com/external/skia/include.git at 131e138f57d72cde1c1549ba33301b2d5ea5c3e9

This commit was generated by merge_from_chromium.py.

Change-Id: If6ea7da1269c010f39fb719fc1fb2a3f5511269e