| commit | c61fdfd2d11e4261b333db4f5ac9845c5e5ed055 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Tue May 11 21:19:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 21:19:00 2021 +0000 |
| tree | 5eb9a9a595c70b01d5e1b61aef262731b2edc1d6 | |
| parent | 585a63abbe5fbda7d4643f06e2a03250a88f3463 [diff] | |
| parent | 70ba49b0e51e03574f1d2570798daae6149870c3 [diff] |
Merge "Fix incompatibilities with Kotlin 1.5.0" am: 600dcaf908 am: 70ba49b0e5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697314 Change-Id: I5ba357b8fe77930d2602c436bafbcde841624fa0