| commit | 51a1b7d0825095429054d639e7aecb882a930229 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Wed May 12 22:52:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 12 22:52:55 2021 +0000 |
| tree | 26ae040b1a634aa2f7abc7e9359aeb4e4503a139 | |
| parent | 47592cbceebed0bbea0c77f7c33d6320a276f006 [diff] | |
| parent | c2db9c85cc6b2a1c566ad1bbae0a17099b9dac5f [diff] |
Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" am: f1e2bb9a81 am: c2db9c85cc Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705633 Change-Id: I39fdc7fb9ad8109e51e2d3bdee1bc4fb3354a247