Skip to content
Commit c61fdfd2 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by Automerger Merge Worker
Browse files

Merge "Fix incompatibilities with Kotlin 1.5.0" am: 600dcaf9 am: 70ba49b0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697314

Change-Id: I5ba357b8fe77930d2602c436bafbcde841624fa0
parents 585a63ab 70ba49b0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment