Skip to content
Commit edce745b authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-de30185d-edfc-49d5-b5e1-aa1bdb83d97a" into nyc-mr2-dev

* changes:
  [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f5 am: f8f1a5f6 am: d43877ac skipped: d4481934 am: 7240438e am: 7f08f162 am: 2fd221eb am: e071682a
  [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f5 am: f8f1a5f6 am: d43877ac skipped: d4481934 am: 7240438e am: 7f08f162 am: 2fd221eb
  [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f5 am: f8f1a5f6 am: d43877ac skipped: d4481934 am: 7240438e am: 7f08f162
  [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f5 am: f8f1a5f6 am: d43877ac skipped: d4481934 am: 7240438e
  [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f5 am: f8f1a5f6 am: d43877ac skipped: d4481934
  [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f5 am: f8f1a5f6 am: d43877ac
  [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f5 am: f8f1a5f6
  [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f5
  Revert "mm-video-v4l2: Protect buffer access and increase input buffer size"
parents d1d8a3d2 a8c07e02
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment