| commit | b6da9f974100841b57b0d5b7059513f634758235 | [log] [tgz] |
|---|---|---|
| author | Robin Peng <robinpeng@google.com> | Wed Apr 22 22:31:22 2020 +0800 |
| committer | Robin Peng <robinpeng@google.com> | Mon May 04 08:35:11 2020 +0000 |
| tree | 9ca5671c63f6a90bae6d5a4e922b11df7cd24c4a | |
| parent | a93643c0df4d4be4fe71adf15cfb775bd03fee98 [diff] | |
| parent | 63fa34cde69404d93e8b81224a974f3954603acf [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R1.10.00.00.597.042' into rvc-d1-dev Conflicts: conf_files/kona/kona.mk mm-video-v4l2/vidc/common/Android.mk mm-video-v4l2/vidc/vdec/Android.mk mm-video-v4l2/vidc/venc/Android.mk Bug: 153823050 Bug: 154783898 Change-Id: I19ae9508ad0551b7dbd5e6143c8c35e7902b8c8a