tree fc095b092b3e9776b3f7f42aa29b7926fc77ec66
parent d8f69b0989022e24836999b5a241d7052588b49b
parent fe11980538c7b6048d27a3fcd27d85db2110f9a6
author Andrey Kulikov <andreykulikov@google.com> 1594984938 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1594984938 +0000

Merge "ui-desktop: get rid of android.graphics/android.text emulation" into androidx-master-dev