| commit | 2170a992daa97c25fc9c5f946a63121b3bee9a35 | [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 | 4056642c24356ab60924a8a5618024dda7d901d8 | |
| parent | f3460b4106016373b5ea840c4dab44db27d6f91e [diff] | |
| parent | ef9be207152d54cbc1382121053e25414b3b2ed3 [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."