| commit | 418aa18b45e7c423602a2ed6dc2feae5a46d7837 | [log] [tgz] |
|---|---|---|
| author | Manish Kumar <manishku@codeaurora.org> | Tue Sep 22 11:35:45 2015 +0530 |
| committer | Manish Kumar <manishku@codeaurora.org> | Tue Sep 22 11:50:14 2015 +0530 |
| tree | b1a4ecbf6cda632a6bcfe236964d8d141d845164 | |
| parent | 6ecc67f43cb06b2d3402d6735d0aaf8bfad9698f [diff] | |
| parent | c14558c665acd048139ca01ca71b0d21976142b4 [diff] |
Merge commit 'c14558c665acd048139ca01ca71b0d21976142b4' into private_redfox64_mbr_1 Conflicts: mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp Change-Id: I2c26bfd7837da58a7acdaff5bb0cc1c709f80755