Commit 03e0c971 authored by John Stultz's avatar John Stultz Committed by Automerger Merge Worker
Browse files

[automerger skipped] ANDROID: dma-buf: heaps: Allow cma heaps to be configured... 

[automerger skipped] ANDROID: dma-buf: heaps: Allow cma heaps to be configured as a module am: a8d66d53 -s ours

am skip reason: Merged-In I8d4516899d42c0b6e145bde8a0fed1235ae46654 with SHA-1 70735d9b is already in history

Original change: https://android-review.googlesource.com/c/kernel/common/+/3814664



Change-Id: I9badab4a2b9f2879ce65e9105d5228cf03058cd2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ffcc44a6 a8d66d53
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment