Skip to content
Commit 32444755 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

Change-Id: Ic5dd50bb4e07fe41fd42d71f765dffef3f48cea7
parents 960233a5 16425854
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