summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-10-07 14:01:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-07 14:01:55 -0700
commitc0c2076e9a4dfd3b30b988d4ddd78abf9ed83166 (patch)
tree0806449362a8ff724808a71f7cc8473e23bfae38 /media
parent5e3329b5fac117ed49c9c3ca2919a4b1533612c4 (diff)
parente0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9 (diff)
downloadframeworks_base-c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166.zip
frameworks_base-c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166.tar.gz
frameworks_base-c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166.tar.bz2
am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread
Merge commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9' into gingerbread-plus-aosp * commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9': Eliminate MCS_GIVE_UP state
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions