tree 4b7cf92009e7a76896cb8ce7b02755528811e532
parent c5c4809c956eb867c80e41df3c7bb3ff230bfb2d
parent c6de5c74e1e5dd92c011a1f060e26e10b15ffb77
author Alan Viverette <alanv@google.com> 1377723998 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377723998 -0700

am c6de5c74: am 236ae4f2: Merge "Set alpha channel correctly when recomputing gradient" into klp-dev

* commit 'c6de5c74e1e5dd92c011a1f060e26e10b15ffb77':
  Set alpha channel correctly when recomputing gradient