tree b12a667d1c85a19a4722c111fdc63adc30cd6d5a
parent 10ece9c9d5c2134a6ea04bf593a2b76d167dbd7a
parent 4678dcc5524258908eadc5fe1e5e1874768967eb
author Rob Tsuk <robtsuk@google.com> 1415828518 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415828520 +0000

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