Skip to content
Commit 122e1887 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 am: 6755ad33 am: 14a070e4
am: 12a9ac14

Change-Id: Id9d903cd00a2d31cd5ffc6f694926ed11495fb70
parents 8ef2ec3e 12a9ac14
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