summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorChien-Yu Chen <cychen@google.com>2014-11-21 02:57:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-21 02:57:52 +0000
commit9020d978f4e838fbda21867d685779841599433a (patch)
treea531b9be8d5e044d1568e64dd61de6bb79dd5548 /media/libmediaplayerservice
parentff7b8bc1fe8a1f8b45e1bea675848efca3306177 (diff)
parent9f77da1003b5a68034a9c34a057517eabbc24326 (diff)
downloadframeworks_av-9020d978f4e838fbda21867d685779841599433a.zip
frameworks_av-9020d978f4e838fbda21867d685779841599433a.tar.gz
frameworks_av-9020d978f4e838fbda21867d685779841599433a.tar.bz2
am 9f77da10: am f4ea51fd: Merge "camera2: fix an error reading a NULL string" into lmp-mr1-dev automerge: c2d88d0
* commit '9f77da1003b5a68034a9c34a057517eabbc24326': camera2: fix an error reading a NULL string
Diffstat (limited to 'media/libmediaplayerservice')
0 files changed, 0 insertions, 0 deletions