tree 28fec0e533e72f993e6e183af3675d87a1462d59
parent d7b3d2f5c40bef24cdb89b53e1e38ca1bcc3b40a
parent b5bd5e565ea850a510ade4e09855a2bf0d2c60b3
author Tim Barron <tjbarron@google.com> 1624356868 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624356868 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' am: 77207b21c2 am: 8c8e24e373 am: b5bd5e565e

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

Change-Id: I082181076fcfc16d527339cb199498399e054ae2