diff options
| author | Ray Essick <essick@google.com> | 2018-05-04 17:52:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-04 17:52:10 +0000 |
| commit | f6bc5412638662a106347c7ff8630c8289ddff38 (patch) | |
| tree | b11d9d4dca6128335b08898217526b6415d7d1b2 | |
| parent | 931f0f7098216174b46217170c6dea51766bec89 (diff) | |
| parent | e869c9fda0251d510d0a8e6608bb2d30fe2cc930 (diff) | |
| download | media-f6bc5412638662a106347c7ff8630c8289ddff38.tar.gz | |
Merge changes from topic "am-de30185d-edfc-49d5-b5e1-aa1bdb83d97a" into oc-dev
* changes:
[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f am: 7f08f16258 am: 2fd221ebe8 am: e071682ab1 am: a8c07e024b
[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f am: 7f08f16258 am: 2fd221ebe8 am: e071682ab1
[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f am: 7f08f16258 am: 2fd221ebe8
[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f am: 7f08f16258
[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f
[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db
[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1
[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d
[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504
Revert "mm-video-v4l2: Protect buffer access and increase input buffer size"
0 files changed, 0 insertions, 0 deletions