| commit | a39ea5f7d980d381ba3b3b2110d58448968237a3 | [log] [tgz] |
|---|---|---|
| author | Jungshik Shin <jungshik@google.com> | Tue May 10 00:31:35 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 10 00:31:35 2016 +0000 |
| tree | b1978d538433d333d26b2f9f88991f1daf6f091d | |
| parent | 54bfe3fcd8393d04a0b48fe9aac3ae9c89e2c16d [diff] | |
| parent | 4ef1089965fbed7256cbf2d6d91c93276cbe25e9 [diff] |
Merge "[DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0" into mnc-dev am: 219e246447 am: cf4d9f4ed4 am: 67b57610bd am: 08cec17454 -s ours am: 4ef1089965 * commit '4ef1089965fbed7256cbf2d6d91c93276cbe25e9': [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0 Change-Id: I5adebed2ae7ea449ea68f42cc45cd84204796795