diff options
| author | Derek Sollenberger <djsollen@google.com> | 2016-07-18 12:07:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-18 12:07:44 +0000 |
| commit | 163c97a8ea0682e91fdccf1c3137ee43b9e00135 (patch) | |
| tree | f02a2a6080f319f18621d40de27592272f21e200 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4e750e822fd2310fb44b56b624eb5b3965b37044 (diff) | |
| parent | 79ad7bedcfaec8ccce22589eb62b342fd0de05af (diff) | |
Merge changes from topic 'skia_merge'
* changes:
Fix include to match Skia filename change
Remove references to SkImageDecoder (part 2)
Update SkiaCanvasProxy with SkSurface API change
Return DNG mimeType for the case kDNG_SkEncodedFormat
Remove use of SkFixed. Update code to use SkGlyph.fAdvance[XY] after https://codereview.chromium.org/1737693006.
skia SkDocument - new MakePDF API, fix leak
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions