tree 25a4380a068212b79efba1d8dc79a4d36ba3c98d
parent a431158c1005bf55b0d5c9e14e785c59f170dae1
parent 487c0b6ae8b44932e45347211bca0e8387718436
author Android Chromium Automerger <chromium-automerger@android> 1415228083 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1415228083 +0000

Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at 487c0b6ae8b44932e45347211bca0e8387718436

This commit was generated by merge_from_chromium.py.

Change-Id: I52ec8f577a9b64496a39bdf9a197e7c527f9356a