tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent c2090e9106d04532373e0742d6fc6c0d59e63233
parent 9254a851d329edc6adc780656519b326148649b5
author Alexander Dorokhine <adorokhine@google.com> 1624306656 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624306656 +0000

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

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

Change-Id: Iafe8a5ec13a047e2552078df4c49ac0095982e69