Commit 265aee2e authored by J. Avila's avatar J. Avila
Browse files

Merge partner/android-gs-pixel-mainline into partner/android-gs-pixel-5.10-stabilization 



* partner/android-gs-pixel-mainline:
  mali_kbase: platform: secure: Assert on correct lock

Signed-off-by: default avatarJ. Avila <elavila@google.com>
Bug: 178425200
Change-Id: Ifa354ed52f7091784c0ff6f65cd1189c2e48aee6
parents 114a798c d64428a7
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