tree 2425ac8553790f0a69ea9f71b9085f0350f01e6b
parent fb90b5ae05b80e0c3f3af7082d34082837391c23
parent 94afeb6ebe27534fc80d7173cc6f67375c3aaca6
author Raph Levien <raph@google.com> 1356113657 -0800
committer Raph Levien <raph@google.com> 1356113657 -0800

Merge from upstream harfbuzz

Change-Id: Ib6dd18e3cc635e9421f3270a273e61a9b7748dc0