| commit | 801453f53349589ba9977231a23b89e929cea00d | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@google.com> | Thu Jun 02 14:07:06 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 02 14:07:06 2011 -0700 |
| tree | c70b13ceadbbadd220586b2a2ad6bf6a2a18dc53 | |
| parent | c6f1f4ac3b3f19222cb72c44e19d5251a3b46831 [diff] | |
| parent | 0f667ff5e57e171311c2b4ec19d29832ffbcd3f7 [diff] |
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.