tree 6ecf834a24676627d4606f86a451e9e903e494c4
parent e0a82fcc6058e6297d11a040aae13e37a2439c14
parent 95f397adb13aa69b15b53bb089078d4dbdb269f1
author James Dong <jdong@google.com> 1306520986 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306520986 -0700

am 95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2

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