summaryrefslogtreecommitdiffstats
path: root/media/libmedia/mediaplayer.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-12-20 14:10:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-20 14:10:26 -0800
commit00169223fb04a14ddb542146223540e3695c8d27 (patch)
treefc573ac753d1a046c0a1300464a0fe2c0a631072 /media/libmedia/mediaplayer.cpp
parent5533367bee43819e72f66506df752d465154cb57 (diff)
parent0b39e8c4dd563b59af4c78c86f735c8d9ef5e481 (diff)
downloadframeworks_av-00169223fb04a14ddb542146223540e3695c8d27.zip
frameworks_av-00169223fb04a14ddb542146223540e3695c8d27.tar.gz
frameworks_av-00169223fb04a14ddb542146223540e3695c8d27.tar.bz2
am 9c891ca3: am 2a55b596: Merge "libvideoeditor: fix cannot show some thumbnails in storyboard or no frame display in PreviewRenderer surface after importing video"
* commit '9c891ca36a7f2acecd70d41ff39a2025048bb0b1': libvideoeditor: fix cannot show some thumbnails in storyboard or no frame display in PreviewRenderer surface after importing video
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
0 files changed, 0 insertions, 0 deletions