OSDN Git Service

am 0f667ff5: (-s ours) am a33bb164: am 4686fb8a: Merge "DO NOT MERGE Correctly implem...
authorRomain Guy <romainguy@google.com>
Thu, 2 Jun 2011 21:07:06 +0000 (14:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Jun 2011 21:07:06 +0000 (14:07 -0700)
commit801453f53349589ba9977231a23b89e929cea00d
treec70b13ceadbbadd220586b2a2ad6bf6a2a18dc53
parentc6f1f4ac3b3f19222cb72c44e19d5251a3b46831
parent0f667ff5e57e171311c2b4ec19d29832ffbcd3f7
am 0f667ff5: (-s ours) am a33bb164: am 4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2

* commit '0f667ff5e57e171311c2b4ec19d29832ffbcd3f7':
  DO NOT MERGE Correctly implement the CLEAR xfermode.