summaryrefslogtreecommitdiffstats
path: root/cmds/stagefright
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2009-10-16 15:21:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-16 15:21:22 -0700
commit720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f (patch)
tree1d9a6c1121af70c8000b6b04b61908feadabd593 /cmds/stagefright
parent12751251cfdccb307117ae87543db6959f7807c7 (diff)
parentda2ecbebd226a0fbc5ed881c541b9126d30f9007 (diff)
downloadframeworks_base-720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f.zip
frameworks_base-720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f.tar.gz
frameworks_base-720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f.tar.bz2
am da2ecbeb: Merge change Idcaa1ef8 into eclair
Merge commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007' into eclair-mr2 * commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007': 1) Add 10 seconds wait time before collecting the end memory.
Diffstat (limited to 'cmds/stagefright')
0 files changed, 0 insertions, 0 deletions