tree 6a548ac46cab39f691bff81f87a85f2143ce5288
parent 13b7b45397e6a2724a2c1e425efec3022f702a8c
parent 4e05c3342e09c44bbe594d0b5c7cda1227e7580f
author Android Chromium Automerger <chromium-automerger@android> 1397069693 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1397069693 +0000

Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at 4e05c3342e09c44bbe594d0b5c7cda1227e7580f

This commit was generated by merge_from_chromium.py.

Change-Id: I1997dd3e9b1ec70f8b9cf596ec74cdf63c72002f