diff options
| author | Robin Peng <robinpeng@google.com> | 2018-12-19 15:27:04 +0800 |
|---|---|---|
| committer | Cyan_Hsieh <cyanhsieh@google.com> | 2018-12-24 14:20:09 +0800 |
| commit | 7b32fbb055e909d13bc39b7d6ea0a2ea22b65c64 (patch) | |
| tree | 9da1cacabe93ac694b33817d3654b8a19cd96c64 /mm-video-v4l2/vidc/vdec/Makefile.am | |
| parent | 573b46b445f2ec7967ebf57499f95636e272371a (diff) | |
| parent | 3917ac13a577a8416e4ecc678c39eaf93510590d (diff) | |
| download | media-7b32fbb055e909d13bc39b7d6ea0a2ea22b65c64.tar.gz | |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.007'
Conflicts:
mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h
Bug: 121228685
Change-Id: I38dfda186f1d12cd2732808d1d8ebbda90946db4
Diffstat (limited to 'mm-video-v4l2/vidc/vdec/Makefile.am')
0 files changed, 0 insertions, 0 deletions