tree 28fec0e533e72f993e6e183af3675d87a1462d59
parent 1a698115fe367b4e3907b31ca4dfa5d6ae430469
parent 77207b21c25fce96d03cc1a1d4f294a99b6868a6
author Tim Barron <tjbarron@google.com> 1624306664 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624306664 +0000

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

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

Change-Id: I5a113ed426158cc7229523ab125cbb9e677efe21