commit | 463d752f5b3042193354ec8c75bb73454a7dac2f | [log] [tgz] |
---|---|---|
author | Alex Hong <rurumihong@google.com> | Wed Feb 26 18:21:08 2020 +0800 |
committer | Alex Hong <rurumihong@google.com> | Wed Feb 26 18:21:08 2020 +0800 |
tree | d4bf8d35e88b6bcf8ad129c05da0aaf4476bb744 | |
parent | 7338ce29053842d95e83136b53efe43806e5f228 [diff] | |
parent | ad4c185b37b48c75c15e9753ce0fe40866006899 [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev Conflicts: mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp Bug: 149539244 Change-Id: I1f76b1a162e331bad8e6af6b259aca271a212460