tree 0cfebd74708bcf6ffd93590c0529f72a88f7fe63
parent fe2fc0873e230903e49e7b4e41f5ca5fd681eb01
parent 75b4fbd0462ad4544ffc447213777d1f0d536c1a
author Xin Li <delphij@google.com> 1606179830 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606179830 +0000

Mark ab/6881855 as merged am: 75b4fbd046

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/13112777

Change-Id: I34dc1397fe2214681e674fe1122b3e7b41bffbfc