Skip to content
Commit 6755ad33 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
am: 454223b1  -s ours

Change-Id: I405e127b6bcc5393cfb38c9fc57a94ba726a0163
parents 0a0278eb 454223b1
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