Skip to content
Commit e17e1f1c 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
am: 86616eae

Change-Id: I47aff0f1fb3018734d67c6fcdc95fb8e1b995cd5
parents 793a28c4 86616eae
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