tree 6d39c3c999c0e556786847caf3d0f3971af04f63
parent 86a6a6d88aa6267ccd298308be5593800376de4d
parent fb57fca03e05d9b0c8e77a907c131e27f6148148
author Android Build Merger (Role) <android-build-merger@google.com> 1487032878 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1487032878 +0000

Merge "[DO NOT MERGE] Update FreeType from 2.6.2 to c38be52bf8de (2.7 + a few post-2.7 CLs) am: f052384f57 am: d2c8b2153e  -s ours am: 56107744bc  -s ours am: 683c64840c  -s ours am: 982314dfd9  -s ours" into nyc-mr2-dev-plus-aosp