summaryrefslogtreecommitdiff
path: root/libs/gui/SharedBufferStack.cpp
diff options
context:
space:
mode:
author Xavier Ducrohet <xav@android.com> 2011-04-11 17:28:59 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-04-11 17:28:59 -0700
commite277418b1d4bc067b20d4019b3a42abc73f1c6b2 (patch)
treee5cbd17b0cddb02ba9057b05f4d828ba3bbeb559 /libs/gui/SharedBufferStack.cpp
parentca24574eec98b26db860ae6ed73eefd417e68afd (diff)
parentf2ab6bc15faffc75bd6fccc5194df92acdfff294 (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.
Diffstat (limited to 'libs/gui/SharedBufferStack.cpp')
0 files changed, 0 insertions, 0 deletions