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

Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" am: f1e2bb9a am:... 

Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" am: f1e2bb9a am: c2db9c85 am: 51a1b7d0

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

Change-Id: I20f9e94bb3241e07052edbe8c042162c2ad6f118
parents dd9dcdfb 51a1b7d0
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