tree ea51f518c6f90dc113678b3a61dc5668484286f7
parent c1392c0fcfe8bb4d971c30bd6813bb72eaa05204
parent 3a1a3b98f843ab5c72644da9addb9473d895a826
author Chris Craik <ccraik@google.com> 1438189905 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1438189905 +0000

Merge "Handle scaling correctly when drawing with shader" into lmp-mr1-ub-dev