tree 7b8ee0ab116e346824bd59c258ab1faf449fa55b
parent 41748a0e502220cfbec1f3ee23c453b1478f3023
parent 740badd5e3e44434a9a47b5d16749daac1e8ea80
author Android Chromium Automerger <chromium-automerger@android> 1410262409 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1410262409 +0000

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

This commit was generated by merge_from_chromium.py.

Change-Id: I9eef239f60f69820f1390b0894595afd8c9764be