tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent 89659ffcb84458da5f0ed2828b32c47f96d63df3
parent 9c1a92cba51da12a861ae78b511aaaf94f59c5ba
author Alexander Dorokhine <adorokhine@google.com> 1624306629 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624306629 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c586b8680c am: e297b1b825 am: 9c1a92cba5

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

Change-Id: I26b027200fc4dbc336ad5a5abd5cd5c1daf42295