tree 4056642c24356ab60924a8a5618024dda7d901d8
parent f3460b4106016373b5ea840c4dab44db27d6f91e
parent ef9be207152d54cbc1382121053e25414b3b2ed3
author James Dong <jdong@google.com> 1307057014 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307057014 -0700

am ef9be207: (-s ours) am 6c2db6fb: am 95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2

* commit 'ef9be207152d54cbc1382121053e25414b3b2ed3':
  Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."