| commit | b3d3f2062cff7f8af392811cf0f3e0887e0f1804 | [log] [tgz] |
|---|---|---|
| author | Pradosh Das <prados@codeaurora.org> | Mon Jul 25 17:54:23 2016 +0530 |
| committer | Pradosh Das <prados@codeaurora.org> | Mon Jul 25 17:54:23 2016 +0530 |
| tree | 7df91c5b00da49c233274d9874bc706080d0c893 | |
| parent | 1b015a680bf7554f9a4767d3da7126db57c65f32 [diff] | |
| parent | 292befe53ca6f6c1432cae32e9c3e53ecb425bbc [diff] |
Merge commit '292befe53ca6f6c1432cae32e9c3e53ecb425bbc' into HEAD Conflicts: mm-core/inc/OMX_QCOMExtns.h mm-video-v4l2/vidc/venc/inc/omx_video_base.h Change-Id: Ia7e64b256f4d559527516bcb2e85acf599477230