| commit | 4ef1089965fbed7256cbf2d6d91c93276cbe25e9 | [log] [tgz] |
|---|---|---|
| author | Jungshik Shin <jungshik@google.com> | Tue May 10 00:25:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 10 00:25:49 2016 +0000 |
| tree | b1978d538433d333d26b2f9f88991f1daf6f091d | |
| parent | dd8ffe5348cef32ba37b33d199d4272adf5f918e [diff] | |
| parent | 08cec174540632cdd99457eb53ac2d854efe5c87 [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 * commit '08cec174540632cdd99457eb53ac2d854efe5c87': [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0 Change-Id: I2056c46d402b57deac8c5c9da7fac73cac5f0538