am 1f2a307b: resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp

Browse Source

* commit '1f2a307b59a6f1d61390425b52c3f0aafc21c54b':
  LayoutLib: don't render when shader's local matrix is set to 0 scale.

...

This commit is contained in:

Xavier Ducrohet

2011-04-11 17:28:59 -07:00

committed by Android Git Automerger

parent 4a1ba21044 1f2a307b59

commit da64f6cf3c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available