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