tree 51db1c717b3cf81d9e227616de47681ac2e2a107
parent 321bb5946a1c1710cb4f7c90915c973af9ce6873
parent 9cb43f00f9b417f241db051f058c52e7a132c435
author Android Chromium Automerger <chromium-automerger@android> 1394608935 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1394608935 +0000

Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at 9cb43f00f9b417f241db051f058c52e7a132c435

This commit was generated by merge_from_chromium.py.

Change-Id: Ia1b359d0976ce49a5b391d2f74fb7d3a804b5a6b