commit | fd9008fa3ae5544a54db2fec5a424b16d72e3750 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 10 10:32:32 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 10 10:32:32 2016 +0000 |
tree | b1978d538433d333d26b2f9f88991f1daf6f091d | |
parent | 076ce9da6f660e324f6f85baf042d602fc81751b [diff] | |
parent | 180dd57472344b4af0db1eba42236a8ed170921a [diff] |
Merge "[DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914 am: d55dd850cb am: 52b3a17d26 -s ours am: 6aebab2093 -s ours am: e85ef9a043 am: 707d74caa5 am: 8e942bf7e5 -s ours am: 56586be400 am: 37595e7d77 am: 81954b2f2f am: 2fc1f401ea -s ours am: 3dfa720cf1 am: be9ff2aca0" into nyc-mr1-dev-plus-aosp