691b47e154
Merge commit 'e1a991476365cf1a8249c842e2b936db6940b0a7' * commit 'e1a991476365cf1a8249c842e2b936db6940b0a7': ADT/Layoutlib: 2 color, linear gradient support.