tree 13109220ebe203b1026d1f499a7eea0df826f830
parent 1abe0e981de19b02c442866e0ff80cb3d0bcc1da
parent 49a30064bc69cb8638e7cecf1e9a7d58fc718716
author Android Chromium Automerger <chromium-automerger@android> 1399334100 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1399334100 +0000

Merge third_party/skia/src from https://chromium.googlesource.com/external/skia/src.git at 49a30064bc69cb8638e7cecf1e9a7d58fc718716

This commit was generated by merge_from_chromium.py.

Change-Id: I9f227703eb8587f893f0c5f7683dd790fce58c22