| commit | 0b72fadde10dada4f753d977bf726c442919661e | [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 | d22b6e74ceca0cc372ef3956198779d7b63c9b46 | |
| parent | 039210e224224dea02f919751079e77fe5014c8c [diff] | |
| parent | 7efd2c2b95af7015c4fdc70fb704f2e26671f63e [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.