| commit | 5f1f6d2761e86ae4e8ae4da09dfc29d5b6b3e51d | [log] [tgz] |
|---|---|---|
| author | Robin Peng <robinpeng@google.com> | Wed Mar 25 17:36:12 2020 +0800 |
| committer | Robin Peng <robinpeng@google.com> | Wed Mar 25 17:36:12 2020 +0800 |
| tree | cdec1c57bdd54dc8130f4ad67cfabffeb3ef7715 | |
| parent | c32b0ee50457531b0845139c783daa6454665825 [diff] | |
| parent | 733312b1c7ef7fa80d97e4c227b19779c0147427 [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R1.10.00.00.597.032' into rvc-dev Conflicts: conf_files/bengal/media_codecs_performance_v1.xml conf_files/bengal/media_codecs_vendor_v1.xml conf_files/lito/media_codecs.xml mm-core/src/registry_table.c mm-core/src/registry_table_android.c Bug: 151568484 Change-Id: I1f4f9acd33eacbfafb00d5022270ca24f8964dc8