tree b358eca2f3baeef7dbfb446b498fb0e9364bd4c1
parent c0491a2e2d30eb4bc3e03fccee89d57e9bd575e4
parent 69e65019b0a6204f0ed9487d8fd7b3564eba6df8
author Chris Craik <ccraik@google.com> 1416607871 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416607873 +0000

Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev