tree 6ec6635e55740fe2c11c674f9ac32514ddfa48f6
parent 39838bec30be846566c9418ee1d31a415c425cba
parent 6bdac48ae6134274c6092f134fb8659f6f39b4d4
author Alexander Dorokhine <adorokhine@google.com> 1617252413 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617252413 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: 6bdac48ae6

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

Change-Id: I26e1a2af3686161500bc7e5294ac598e74d266f1