tree f383e8c957445ae7df533cdfadcdf7fe03d59ec2
parent 6f368d8fdb05caafcf8fab5a891172e0c4db76f7
parent bd7ef0ec81281569904cd6ff13369ba81c247152
author Jungshik Shin <jungshik@google.com> 1486782444 +0000
committer android-build-merger <android-build-merger@google.com> 1486782444 +0000

Merge "Merge Harfbuzz 1.4.2 from the upstream"
am: bd7ef0ec81

Change-Id: Ia7e10ff0d4bb0f2d0ca8d6391fbc5ebd58278f2c