| commit | 6a958235ec6efd2d9cea45e095fde89d41c7942a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue May 18 23:17:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 18 23:17:14 2021 +0000 |
| tree | 2c47f57488d23a055242e5a8af0cc4f063edc62c | |
| parent | edd6684f8879aa69a12671fec535bdcdae5c1e25 [diff] | |
| parent | c4db697186c4e56c24bec2cee7b16de27facedd8 [diff] |
Merge "Revert^2 "Fix incompatibilities with Kotlin 1.5.0"" am: b7bccf0c76 am: c4db697186 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709778 Change-Id: If3e51f818d2ac479af7f829b0781fbefffe028f4