tree 9a7b625bfe5d41bda8cb037eb7380ed8a72f8fba
parent b841a46fdb44270588ac17bdbdbf3c0e17b2419e
parent a24a0e647bb718b3540db89864cf586b12331e82
author Android Chromium Automerger <chromium-automerger@android> 1415203419 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1415203419 +0000

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

This commit was generated by merge_from_chromium.py.

Change-Id: I5ff279834b9b4a16e05ba9054b29eaf7ab00c9c9