summaryrefslogtreecommitdiffstats
path: root/media/libmedia/IMediaPlayerService.cpp
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-09-18 17:58:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-18 17:58:26 -0700
commitd5a9ae029b50678de3b468d8324728a73ff5b0aa (patch)
tree08c354ef92537e01b74b2abe66f65ee0da9d03cb /media/libmedia/IMediaPlayerService.cpp
parenta2acc96eadc02228b8a3366de3d05d3a6a81272c (diff)
parent59ab044774bf7fd0b841087212078babb4451eb8 (diff)
downloadframeworks_av-d5a9ae029b50678de3b468d8324728a73ff5b0aa.zip
frameworks_av-d5a9ae029b50678de3b468d8324728a73ff5b0aa.tar.gz
frameworks_av-d5a9ae029b50678de3b468d8324728a73ff5b0aa.tar.bz2
Merge "Camera2: Increase capture timeout." into jb-mr1-dev
Diffstat (limited to 'media/libmedia/IMediaPlayerService.cpp')
0 files changed, 0 insertions, 0 deletions