tree 6342f239013923cef44f76d9452a235a34612a60
parent 0bc7a38463bfb37f12efeb1b8cb2024cf4a347bc
parent d16ddbcbbee39b07a028776995c635119fe3cd98
author Raph Levien <raph@google.com> 1356058447 -0800
committer Raph Levien <raph@google.com> 1356058447 -0800

Merge from upstream harfbuzz

Change-Id: I4feba5e1b841b0325ca00cdb6e4964b1e0256fdc