summaryrefslogtreecommitdiffstats
path: root/libvideoeditor/vss/common/inc/M4_Utils.h
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-06-09 21:12:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-09 21:12:44 +0000
commit4299a7c2b049b07b3456a81a4c2b1030523c08ca (patch)
treed3540220be0376ea8166a6d60941fd9ef753dc99 /libvideoeditor/vss/common/inc/M4_Utils.h
parentcb3d3a365c91ed996c47dea6ff1490f2f13c1b52 (diff)
parent940f8be3619cecda66dad33f995904795df88c2d (diff)
downloadframeworks_av-4299a7c2b049b07b3456a81a4c2b1030523c08ca.zip
frameworks_av-4299a7c2b049b07b3456a81a4c2b1030523c08ca.tar.gz
frameworks_av-4299a7c2b049b07b3456a81a4c2b1030523c08ca.tar.bz2
am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
* commit '940f8be3619cecda66dad33f995904795df88c2d': Implement a NoOp DrmManagerClientImpl when no DRM service exists
Diffstat (limited to 'libvideoeditor/vss/common/inc/M4_Utils.h')
0 files changed, 0 insertions, 0 deletions