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

Change-Id: I4f62d1b5a604ccb6397212fdf9690c1874350116
parents a382d761 5d2e3aa0
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