tree 8addae5c911b3257bcf4d32b878e1f2a0a9d0597
parent f32c414516d0196f6a2eb34809e16f670506f745
parent 21e2d90077b889f17dd1ca74b3cb6f76aa8b1a87
author Torne (Richard Coles) <torne@google.com> 1378977508 +0100
committer Torne (Richard Coles) <torne@google.com> 1378977508 +0100

Merge third_party/skia/gyp from https://chromium.googlesource.com/a/external/skia/gyp.git at 21e2d90077b889f17dd1ca74b3cb6f76aa8b1a87

This commit was generated by merge_from_chromium.py.

Change-Id: Ib74a51559d43fa36e2d96babb69fe4cb3653e71d