summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-05-27 11:33:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-27 11:33:26 -0700
commitef9be207152d54cbc1382121053e25414b3b2ed3 (patch)
tree4dba6ae9abab3d6884137f87f6206949e09c8f43 /include
parentccb2bc6c155c09e88e4fbbbd30382ae58c087ce5 (diff)
parent6c2db6fb1925f291cc9748cf3bf0897b9001c972 (diff)
downloadframeworks_base-ef9be207152d54cbc1382121053e25414b3b2ed3.zip
frameworks_base-ef9be207152d54cbc1382121053e25414b3b2ed3.tar.gz
frameworks_base-ef9be207152d54cbc1382121053e25414b3b2ed3.tar.bz2
am 6c2db6fb: am 95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2
* commit '6c2db6fb1925f291cc9748cf3bf0897b9001c972': Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions