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

Merge "DO NOT MERGE: mm-video-v4l2: venc: Disallow changing buffer count/size... 

Merge "DO NOT MERGE: mm-video-v4l2: venc: Disallow changing buffer count/size on allocated port" into mnc-dev am: 943c1386 am: 61af9b8b am: 3a1995ab am: 91d14630  -s ours am: dd9be859
am: 8b32cbeb

Change-Id: I37fc8c6baeefa1bcd92112bd907657c598bd2039
parents 13fd0182 8b32cbeb
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