tree 14e1ef50484fdbbe325bb6126e084f10d0738d51
parent a0d17f80902468b5a4e0874daeac92abc6f71b3e
parent 37424b3d5540bf569269ec6fef55689866d943a3
author Chris Craik <ccraik@google.com> 1421793544 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1421793547 +0000

Merge "Simplify and correct texture upload unpack alignment parameter"