| commit | 3917d4d929d4c44a79b16fcc7a7c019c4fe2534e | [log] [tgz] |
|---|---|---|
| author | Manish Kumar <manishku@codeaurora.org> | Fri Sep 25 13:46:16 2015 +0530 |
| committer | Manish Kumar <manishku@codeaurora.org> | Fri Sep 25 13:47:56 2015 +0530 |
| tree | 17d4e30825c1f17cd5adfd80053278f7d695b36e | |
| parent | 5987f316c3b786230ee6d45744b8ab035bcf0231 [diff] | |
| parent | a2d1c30003b9723094e0e01f15f9db40cb327730 [diff] |
Merge commit 'a2d1c30003b9723094e0e01f15f9db40cb327730' into private_redfox64_mbr_1 Conflicts: mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h Change-Id: I97d5b48f50718773bb5472807fb188dd45d86968