| commit | 1ae8a98e8a6ba82396955c0b6ab0e02568a3494b | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri Nov 21 22:13:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 22:13:30 2014 +0000 |
| tree | 84aa8bcecc2b5305ca17256f5ae4cceaab79ce29 | |
| parent | 54c11274b5e7ce9f774f7c846d7165563279b96a [diff] | |
| parent | 29dc496a42d49a37dcd99c0465f3cec18a47e6ff [diff] |
am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev * commit '29dc496a42d49a37dcd99c0465f3cec18a47e6ff': Revert "Add a way to override Xfermode DO NOT MERGE"