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

Merge remote-tracking branch 'androidx-platform-dev' into master am: deed1c7dfc am: e43582e662

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

Change-Id: I40be81bd0c734e05ed735dcf79b4b78247cc3770