tree 8f35e94e2eef8136e4fc5ba567ddd737d7d26b68
parent 12fc9e9c1b483568b72ed83628097dcbe3aa6684
parent 0ff4e1aa19641cda58e3ed98399e0d96e6ccd7c2
author Android Chromium Automerger <chromium-automerger@android> 1402050161 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1402050161 +0000

Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at 0ff4e1aa19641cda58e3ed98399e0d96e6ccd7c2

This commit was generated by merge_from_chromium.py.

Change-Id: I5cbee9e1d503218e58da79bf5bb37ccb08cbc750