Skip to content
Commit 7e9726d4 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
am: 576bd7bd  -s ours

Change-Id: I703e787f7ab43c06abd1a4acc0ee7ed6bcd034f9
parents e96a3462 576bd7bd
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