| commit | e277418b1d4bc067b20d4019b3a42abc73f1c6b2 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Mon Apr 11 17:28:59 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 11 17:28:59 2011 -0700 |
| tree | e5cbd17b0cddb02ba9057b05f4d828ba3bbeb559 | |
| parent | ca24574eec98b26db860ae6ed73eefd417e68afd [diff] | |
| parent | f2ab6bc15faffc75bd6fccc5194df92acdfff294 [diff] |
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.