tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent 16b1321dad1bcbd7a2326c51ce43f596a398990c
parent 191864b1def61a8e3c385c73efe19379f1b5f0b3
author Alexander Dorokhine <adorokhine@google.com> 1624306616 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624306616 +0000

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

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

Change-Id: Ib26ba5b1fd95f694fc3768279221b9cbeb1feff2