tree b77a646b8fde339c013c6717b3eccf07f4506eee
parent 789145afd1ddadbd7ac40b5f713c8e0812c97c17
parent 826a5d6f25abb72d751a360eb2bbfd650aa49a78
author Treehugger Robot <treehugger-gerrit@google.com> 1591374957 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591374957 +0000

Merge "Support TypeConverters on kotlin objects" into androidx-master-dev am: 826a5d6f25

Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/1323097

Change-Id: I0f0bb79ca964d2dcef8dc6684e8b65a8aaced70c