tree 7f674624153c9e09cb0c42dc900adb7776060642
parent 25501ce03e15e3e9f9d4fc7db4652e0ab6a77c63
parent 961f4e74a20aa05ef5a89b548b29a43a2edb7f42
author Android Chromium Automerger <chromium-automerger@android> 1399361257 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1399361257 +0000

Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at 961f4e74a20aa05ef5a89b548b29a43a2edb7f42

This commit was generated by merge_from_chromium.py.

Change-Id: Ic813812cf8c641dbebab50fd739d3dcfbfceeccf