tree e9b6ee1d1b0706ac92ba644efc8a65c31fd5c43c
parent f322d71f2c6f8f0ff2044e95f1000afcf31737a1
parent 206c6aa4450db4e961d20f8367f33df42bba6a85
author Android Chromium Automerger <chromium-automerger@android> 1409094574 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1409094574 +0000

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

This commit was generated by merge_from_chromium.py.

Change-Id: I4f028796bb29a8343be9cf319fb5f8e22a92873b