tree df69fa5d6c229b887eec6ad4064eda26250519ea
parent bfb23dc5883711d6b2b8fc128d2156b757b24e68
parent 77abf65c1d72af6fb7f9ef6f50cdf29fcf42d0a1
author Android Chromium Automerger <chromium-automerger@android> 1409254964 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1409254964 +0000

Merge tools/grit from https://chromium.googlesource.com/external/grit-i18n.git at 77abf65c1d72af6fb7f9ef6f50cdf29fcf42d0a1

This commit was generated by merge_from_chromium.py.

Change-Id: I09759be2fe71bf6517ce0dcd608df113d35dfb6f