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

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

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

Change-Id: I7834cf39e7c43168d92a4f22db2b568c889db2ec