| commit | 92995d2d6063427402dd4c76b78140c731ea698d | [log] [tgz] |
|---|---|---|
| author | Jungshik Shin <jungshik@google.com> | Tue Feb 14 00:43:49 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 14 00:43:49 2017 +0000 |
| tree | e98153acc563ea86bf41c619d2d6fc784705757a | |
| parent | 173c15b10477e4b9727ac6241b1d10945e124090 [diff] | |
| parent | 502d4f1651aa8ba2fb3af7db055faa5902347620 [diff] |
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 am: 502d4f1651 -s ours Change-Id: I4d2dfae08574d295514847a4e227f22a7fc3ac89