tree ad988be7ad87928b7b98c44f2def4cce7d3330b6
parent 8a8bbe67c60d28430d0a52a68f2ebc67574f3b33
parent 1ffcf188ba353bf82876a8d55a127ea6e1dcb27a
author Android Chromium Automerger <chromium-automerger@android> 1399461499 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1399461499 +0000

Merge third_party/skia/src from https://chromium.googlesource.com/external/skia/src.git at 1ffcf188ba353bf82876a8d55a127ea6e1dcb27a

This commit was generated by merge_from_chromium.py.

Change-Id: I1bb3256d62017f06f9b6266f5c21e715f807d337