tree 82791080cab6870996188aedeb9103c84a680692
parent b5a48ebabe7cdca1ea03a81caca12dea436baf17
parent 90b30dc00de3e8a2ba3bec2bc7bd10daef042dff
author Jesse Hall <jessehall@google.com> 1355954759 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1355954760 -0800

Merge "Fix assumption that pixel alpha is in upper 8 bits"