Google Git
Sign in
android / platform / hardware / qcom / sm8150 / media / refs/heads/android12-qpr1-d-s3-release
commiteb9f4d24af8c997e5c687df6873a248445bef8ce[log] [tgz]
authorWilson Sung <wilsonsung@google.com>Mon May 24 18:29:26 2021 +0800
committerChang-Yan Lee <changyan@google.com>Tue May 25 06:08:27 2021 +0000
tree7aa5196313b280a2787ad832462c59ec3ae216be
parent748f3f05bde7a465ace3eae7d8fbef3087032070 [diff]
parent5ec0a127f5f4092754ccbee5a4d9b71603ddcc51 [diff]
Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.013' into sc-dev

 Conflicts:
	conf_files/atoll/media_codecs.xml
	conf_files/atoll/media_codecs_performance.xml
	conf_files/atoll/media_codecs_vendor.xml
	conf_files/sm6150/media_codecs.xml
	conf_files/sm6150/media_codecs_sdmmagpie_v1.xml
	conf_files/sm6150/media_codecs_vendor_sdmmagpie_v1.xml
	mm-core/src/registry_table.c
	mm-core/src/registry_table_android.c
	mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
	product.mk

Bug: 188781413
Bug: 189096555
Change-Id: I3ff3c2d9f700e0e134fedc8e0012381cdd9442b3
tree: 7aa5196313b280a2787ad832462c59ec3ae216be
  1. conf_files/
  2. hypv-intercept/
  3. libarbitrarybytes/
  4. libc2dcolorconvert/
  5. libplatformconfig/
  6. libstagefrighthw/
  7. mm-core/
  8. mm-video-v4l2/
  9. Android.mk
  10. CleanSpec.mk
  11. configure.ac
  12. LICENSE
  13. Makefile.am
  14. METADATA
  15. MODULE_LICENSE_APACHE2
  16. MODULE_LICENSE_BSD
  17. MODULE_LICENSE_MIT
  18. product.mk