| commit | 35fd0e5b242245c0b8b50eba84db71439731245b | [log] [tgz] |
|---|---|---|
| author | Andrew Dodd <atd7@cornell.edu> | Wed Apr 30 20:24:01 2014 -0400 |
| committer | Andrew Dodd <atd7@cornell.edu> | Wed Apr 30 20:24:01 2014 -0400 |
| tree | 43550e63d2c80c23e18f68ab527671d9f69a3f84 | |
| parent | ea1d970cbe2ea07ae8ea99069701c69c6fca94cc [diff] | |
| parent | 0e35420e6df1e11ccf4c0de5cdcd46fda5dfb5de [diff] |
Merge tag 'AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298' into work AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298 Conflicts: mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp Change-Id: Ic6894428261878cc3cd19fb96c11f334a1d1b56d