Merge commit 'a97d21ab42d5a4d772c6180230bb37bbca550005'

Merge made by the 'ours' strategy.

* commit 'a97d21ab42d5a4d772c6180230bb37bbca550005':
  ANDROID: GKI: export cma symbols for cma heap as a module
  ANDROID: dma: Rework so dev_get_cma_area() can be called from a module

Change-Id: Ic93f4999d89fee8c61da438a29d6c0ac2c599707
This commit is contained in:
Tao Huang
2024-08-29 20:48:35 +08:00

Diff Content Not Available