tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent 5449f62ffeb808f4f940ea7651b2cf8fe4dba306
parent e448a1cf866733a4327759c25ecb66fd9a5739c5
author Alexander Dorokhine <adorokhine@google.com> 1624306603 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624306603 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: b7ee27c61c am: e448a1cf86

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

Change-Id: Ifac5ab4f1d5bbb341bb700cfda712b949a3d5262