summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2011-05-26 16:57:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-26 16:57:18 -0700
commita33bb164b2ac792d5bba76ba198fb052197fd520 (patch)
tree9d5169f8ce7f9bdbf17271c8f5624cd9ff0e22af /core/java/android/app
parent4ce6822bc63665ca3e9d9984766f367ce4f4d3a7 (diff)
parent4686fb8ac8c88eb1f0d76fc4157be4cb5949e98e (diff)
downloadframeworks_base-a33bb164b2ac792d5bba76ba198fb052197fd520.zip
frameworks_base-a33bb164b2ac792d5bba76ba198fb052197fd520.tar.gz
frameworks_base-a33bb164b2ac792d5bba76ba198fb052197fd520.tar.bz2
am 4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2
* commit '4686fb8ac8c88eb1f0d76fc4157be4cb5949e98e': DO NOT MERGE Correctly implement the CLEAR xfermode.
Diffstat (limited to 'core/java/android/app')
0 files changed, 0 insertions, 0 deletions