| commit | 8ea3f65fe0fb8d3d645b944addc717186cc1e1ab | [log] [tgz] |
|---|---|---|
| author | ChihYao Chien <ccchien@google.com> | Fri Oct 23 14:31:15 2020 +0800 |
| committer | ChihYao Chien <ccchien@google.com> | Fri Feb 26 11:47:46 2021 +0800 |
| tree | 057f60c559b3e76d56b844b0f3e46aabf2af18ea | |
| parent | 66e77cc4b6de76a5ec8904a7a98485b25f868233 [diff] | |
| parent | e95a8dc3d55610817d59936efe105904c60ffba6 [diff] |
Merge branch 'goog/qcom/release/LA.UM.9.12.R2.10.00.00.685.039' Conflicts: conf_files/bengal/media_codecs_vendor.xml Bug: 171353985 Change-Id: I348733f975c6c09a9f1994c5bfc8de4bea3be94d