summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-08-30 11:40:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-30 11:40:42 -0700
commit83307bac03c27c1c344fd24fdfbabc2d0a63a29d (patch)
tree3d8014fd5d1dc32bf9db8a0d0e0c7053739c36a7 /media/libmediaplayerservice
parent63bfd7fe7d14fd083bebba3a230938e8d6f62fd5 (diff)
parent38f910bdfa1fb0665261eb60e0afdb4986c8934f (diff)
downloadframeworks_av-83307bac03c27c1c344fd24fdfbabc2d0a63a29d.zip
frameworks_av-83307bac03c27c1c344fd24fdfbabc2d0a63a29d.tar.gz
frameworks_av-83307bac03c27c1c344fd24fdfbabc2d0a63a29d.tar.bz2
am 38f910bd: am 23466a95: Merge "Camera2: Require 2 JPEG thumbnail resolutions." into jb-mr1-dev
* commit '38f910bdfa1fb0665261eb60e0afdb4986c8934f': Camera2: Require 2 JPEG thumbnail resolutions.
Diffstat (limited to 'media/libmediaplayerservice')
0 files changed, 0 insertions, 0 deletions