diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-11-02 17:45:18 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-11-02 17:45:21 +0000 |
commit | 299978132b8482beca745cc6f4c61f2e27fef825 (patch) | |
tree | 34cf492cab8080d02b4967a27a0d06f8ed09b17a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 54f53906bd694f153fff567d5941c4aba3a0ed9a (diff) | |
parent | f87da67df90968adcddb2404ff20a41fe49a0315 (diff) |
Merge changes from topic 'skia_merge'
* changes:
Adding changes required by the master-skia merge.
use SkBlendMode
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions