tree 9fc0895e69e44fcb162b1095d92b121c1c92b99e
parent 8a6283ea5de39bd81f04556d7c380f58d08ef9c3
parent 46325e158ded34094429be3dd405fc61d51ec1bf
author Alexander Dorokhine <adorokhine@google.com> 1617773147 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617773147 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: 46325e158d

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

Change-Id: I3fdd37ea1e7d1750b0fa6f67a44b51108c542f90