tree 24b5b4028eee766b7f6e16817cea37d577def9fa
parent 8607f5744cc2d010ef10bd5dac765a77f536e67c
parent f9a64ff2d1a9cd94044b36ec4819ff7f2cc29e82
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1764803280 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1764803280 -0800

Merge "Merge cherrypicks of ['android-review.googlesource.com/3875588'] into androidx-emoji-release." into androidx-emoji-release