tree 3ee0521484fdb3fc182db25009e8953abb378364
parent 9c1a92cba51da12a861ae78b511aaaf94f59c5ba
parent 00d8a9f5411e21b902626102f6937cb31081a74f
author Alexander Dorokhine <adorokhine@google.com> 1622174748 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622174748 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c2d7a0a93e am: ff7508e7a7 am: 00d8a9f541

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

Change-Id: I8008f8cd35a97a324b47795efe7fab786e2c46ce