| commit | 4c9b195caed851e01322a9509aaa476f15e760dd | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Tue May 11 21:20:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 21:20:45 2021 +0000 |
| tree | f1ff8e9e1bd3d6201cb8b86abda9aca39bbd0a16 | |
| parent | 59ea888741694708a39d88187f33eccc1eb1e632 [diff] | |
| parent | c61fdfd2d11e4261b333db4f5ac9845c5e5ed055 [diff] |
Merge "Fix incompatibilities with Kotlin 1.5.0" am: 600dcaf908 am: 70ba49b0e5 am: c61fdfd2d1 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697314 Change-Id: I4c76908e0cf9a1ba0493322c1f8dedb4fa925e80