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

Merge "DO NOT MERGE: mm-video-v4l2: vdec: Disallow changing buffer... 

Merge "DO NOT MERGE: mm-video-v4l2: vdec: Disallow changing buffer modes/counts on allocated ports" into klp-dev am: fe73eaeb am: 2ef98531 am: 91509795  -s ours am: e43ccca5  -s ours
am: c835c9ca

Change-Id: I057bd259472044c869c0a6b561735385586f49a9
parents 56562b75 c835c9ca
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