summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2009-10-29 01:46:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 01:46:47 -0700
commita41ff4b7c2b68aa5d651bcecfce9fc9621c145cb (patch)
tree73c7afabf7a2992ce471612446003d446aeade97 /media
parent2eca23d690379911a102729eecd35412d0c8be63 (diff)
parentc867958eb6fb50210a767fa24757bfa19228c22e (diff)
downloadframeworks_base-a41ff4b7c2b68aa5d651bcecfce9fc9621c145cb.zip
frameworks_base-a41ff4b7c2b68aa5d651bcecfce9fc9621c145cb.tar.gz
frameworks_base-a41ff4b7c2b68aa5d651bcecfce9fc9621c145cb.tar.bz2
am c867958e: am d376d240: Merge change I081f08c1 into eclair
Merge commit 'c867958eb6fb50210a767fa24757bfa19228c22e' into eclair-mr2-plus-aosp * commit 'c867958eb6fb50210a767fa24757bfa19228c22e': A better solution for ignoring user activity while the screen is animating off.
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions