| commit | cc716a020257a18ce37a2aae884bbeef512f940b | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Thu Jun 02 16:23:34 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 02 16:23:34 2011 -0700 |
| tree | d22b6e74ceca0cc372ef3956198779d7b63c9b46 | |
| parent | d4453a32b1f44428d36e429641d6f047b3758c16 [diff] | |
| parent | 516460c79b3859185f91573cdb0fdd0ad0205997 [diff] |
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."