| commit | 90102e10093f7bb658fb7dd6c30a1efd5380c6d1 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri Nov 21 22:21:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 22:21:02 2014 +0000 |
| tree | 8e13cdc9be351def8f0b2c14b9ed60eb2f4592be | |
| parent | 220c3f4f48b53b6010093a1ef437f4197a382ebf [diff] | |
| parent | 1ae8a98e8a6ba82396955c0b6ab0e02568a3494b [diff] |
am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev * commit '1ae8a98e8a6ba82396955c0b6ab0e02568a3494b': Revert "Add a way to override Xfermode DO NOT MERGE"