summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-09-17 11:09:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-17 11:09:21 -0700
commit628335809726683ce13d49d51ab51ef984933a13 (patch)
treefb79d9200fb1ed6646451be888e69227973005b1 /media/libmediaplayerservice
parent30fe5bade008909e907aca9ce2eba408ca01e859 (diff)
parent66fe313df7c31dee554265a3d7799123b889e532 (diff)
downloadframeworks_av-628335809726683ce13d49d51ab51ef984933a13.zip
frameworks_av-628335809726683ce13d49d51ab51ef984933a13.tar.gz
frameworks_av-628335809726683ce13d49d51ab51ef984933a13.tar.bz2
am 92908745: am b845c6b0: Merge "Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""" into jb-mr1-dev
* commit '92908745a52989339dc5b9ebf3d402607ea09b24': Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""
Diffstat (limited to 'media/libmediaplayerservice')
0 files changed, 0 insertions, 0 deletions