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

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

Merge "DO NOT MERGE ANYWHERE: mm-video-v4l2: venc: Disallow changing buffer count/size on allocated port" into lmp-mr1-dev am: 5d2e3aa0  -s ours am: be1d18be  -s ours am: 16425854  -s ours
am: 32444755  -s ours

Change-Id: I9110035fa45b6758b3ac3e3cac11de3d34f04140
parents 23a81414 32444755
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