tree b6f19f93feb9c255e8247f7c096bd41a0a737d26
parent 1601eef22fad0b21a0322cdd900f1263cce15988
parent 221895a6947ba80eccb89a312789b7bf73654127
author Alexander Dorokhine <adorokhine@google.com> 1621143271 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621143271 +0000

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

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

Change-Id: I8254f99378e1ac65fb1fc7d758486d024b29498f