tree a0306de11308483759e2b859196ea28a7c9d4512
parent 8cba613a0b71e71abcab87aa2478cdddf5bef1ef
parent 7f848593bd2ec83f4537b6d494a5bf55b9bd4456
author Android Chromium Automerger <chromium-automerger@android> 1394213649 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1394213649 +0000

Merge third_party/brotli/src from https://chromium.googlesource.com/external/font-compression-reference.git at 7f848593bd2ec83f4537b6d494a5bf55b9bd4456

This commit was generated by merge_from_chromium.py.

Change-Id: I0c8c7ed554118b2b598bd011ec6532676f881e20