tree 3a3cde2cdfad9bdd72b60fc5a3db07940086be9d
parent 29d3fe29dcd893800380a592eb3d9a31f0f66f1e
parent bb2c3b09c2843ef0212cb210c546125d45d8678f
author ChengYou Ho <chengyouho@google.com> 1588775954 +0800
committer ChengYou Ho <chengyouho@google.com> 1588866177 +0800

Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.038' into rvc-dev

 Conflicts:
	mm-video-v4l2/vidc/vdec/Android.mk
	mm-video-v4l2/vidc/venc/Android.mk

Bug: 155859424
Change-Id: I4def643f79900ac8242ca31309e376527446543d