tree c7c6251292221fbdc8ce32a3caba71e3ed1ee18c
parent c61646a215cab9273baf3c16be9def4abdbb1b85
parent 623207c55e842977c887addefa1cd12cf01909d7
author Tim Barron <tjbarron@google.com> 1625255232 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625255232 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' am: 8ed9ccef5c am: 914dcccaf0 am: 623207c55e

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/15162658

Change-Id: I4f4e6fc2e4a060e679fc36e5d226d3a7dbc1a9a1