| commit | d57fa79d705368aa82569420e4d89d23fd49377b | [log] [tgz] |
|---|---|---|
| author | jungshik <jungshik@google.com> | Fri Jan 15 21:01:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 15 21:01:24 2016 +0000 |
| tree | fd248ee6855c1f705bc9bcb0e089bde5a2207f10 | |
| parent | f110ccadb8fb59c455530346f9af9a7a57070880 [diff] | |
| parent | a0bd57a38363fd1f6a6866bca38cc49e8f834f81 [diff] |
Merge "Update FreeType to a512b0fe7a from 2.6.0" am: a0bd57a383 -s ours * commit 'a0bd57a38363fd1f6a6866bca38cc49e8f834f81': Update FreeType to a512b0fe7a from 2.6.0