tree 3d437179da91321aadfd4a1cddc169325a8d32a4
parent c25c9032ffdca20a4080db5a1fe1e771af9256f6
parent 51e7805f14062df674f613fdaa830030aaaa4f8e
author Derek Sollenberger <djsollen@google.com> 1458130634 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458130636 +0000

Merge "Remove all non-porterduff xfermodes from the public API" into nyc-dev