tree 2425ac8553790f0a69ea9f71b9085f0350f01e6b
parent 0bc7a38463bfb37f12efeb1b8cb2024cf4a347bc
parent 850c82b49852bfabdd82c3ccdd29d8e89b5f91c1
author Raph Levien <raph@google.com> 1357593403 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1357593403 -0800

Merge changes Ib6dd18e3,I4feba5e1

* changes:
  Merge from upstream harfbuzz
  Merge from upstream harfbuzz