summaryrefslogtreecommitdiffstats
path: root/media/libmedia/mediaplayer.cpp
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2015-04-30 23:07:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-30 23:07:25 +0000
commita8df0b716bdfda1e10790e6f7297eeff83d2e52a (patch)
treed4a3380de6d739613b6f1b9822ff92b7e5e8be36 /media/libmedia/mediaplayer.cpp
parent5aab9254a5c4f1951c12216a71550ab95b4adeaa (diff)
parentd48521fc2f7c34623a745728a07dad728da49254 (diff)
downloadframeworks_av-a8df0b716bdfda1e10790e6f7297eeff83d2e52a.zip
frameworks_av-a8df0b716bdfda1e10790e6f7297eeff83d2e52a.tar.gz
frameworks_av-a8df0b716bdfda1e10790e6f7297eeff83d2e52a.tar.bz2
Merge "Camera: API1 shim: Don't tightly apply crop region" into mnc-dev
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
0 files changed, 0 insertions, 0 deletions