tree f383e8c957445ae7df533cdfadcdf7fe03d59ec2
parent bacffca30b08d279489993887e133b9041c5f85b
parent 45382daa316d483013cf0caa329337c2e965d5ca
author Jungshik Shin <jungshik@google.com> 1486782714 +0000
committer android-build-merger <android-build-merger@google.com> 1486782714 +0000

Merge "Merge Harfbuzz 1.4.2 from the upstream" am: bd7ef0ec81 am: a9c46cb26e
am: 45382daa31

Change-Id: I077e1a2bf67b3161f6e507528c0a90ab0ada1a3f