tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent cbb9ccb4a785072c9381876172fcd6c0631711fc
parent 5f7bc8e343b9e98050907472c8636031f23d7159
author Alexander Dorokhine <adorokhine@google.com> 1624307758 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624307758 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: 46325e158d am: 191864b1de am: 5f7bc8e343

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

Change-Id: I4a9227e5495ab54701e737b459e1518470e950bf