| commit | b357fadd1ed9c7d073b358864953113214d537b8 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Wed May 12 23:09:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 12 23:09:41 2021 +0000 |
| tree | 40e1fa65b45caa9bf17b58f4a71cec75d1404621 | |
| parent | dd9dcdfb72b89002122ecbe03606b78d4012899f [diff] | |
| parent | 51a1b7d0825095429054d639e7aecb882a930229 [diff] |
Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" am: f1e2bb9a81 am: c2db9c85cc am: 51a1b7d082 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705633 Change-Id: I20f9e94bb3241e07052edbe8c042162c2ad6f118