| commit | c2db9c85cc6b2a1c566ad1bbae0a17099b9dac5f | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Wed May 12 22:20:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 12 22:20:32 2021 +0000 |
| tree | 47a7775de64643f7b94f8a7e8a876352081331fc | |
| parent | eb6daaa8af537cd997a5765d788113d2a2836d66 [diff] | |
| parent | f1e2bb9a8147a6614ea10577da187f93c282e305 [diff] |
Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" am: f1e2bb9a81 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705633 Change-Id: Ic447f14fbeab4215efc758f301b626bc21766b31