Skip to content
Commit 2a3d9e51 authored by Ray Essick's avatar Ray Essick Committed by android-build-merger
Browse files

Merge "DO NOT MERGE ANYWHERE: mm-video-v4l2: vdec: Disallow changing buffer... 

Merge "DO NOT MERGE ANYWHERE: mm-video-v4l2: vdec: Disallow changing buffer modes/counts on allocated ports" into lmp-dev am: 7acbfbba  -s ours am: ab278678  -s ours
am: 689e0eab  -s ours

Change-Id: I114c3b14358bb831f695f4b150831e2775751325
parents df261a1a 689e0eab
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment