tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent fc0c224ca1bd2083939492493c39cb9013e654ff
parent 1601eef22fad0b21a0322cdd900f1263cce15988
author Alexander Dorokhine <adorokhine@google.com> 1624306628 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624306628 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c586b8680c am: 1601eef22f

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

Change-Id: I47044a1a507483b1ae3b318231e575379ebb1af7