Commits
Xavier Ducrohet authored and Android Git Automerger committed da64f6cf3ceM
am 1f2a307b: resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp * commit '1f2a307b59a6f1d61390425b52c3f0aafc21c54b': LayoutLib: don't render when shader's local matrix is set to 0 scale.
Showing diff to4a1ba21044b