tree 49edf1ba008b63bfa2ed8276d421d5ca6f62ec1b
parent 666622b901e7cd86f18d737530eb2524e92f7247
parent 0dc99ac82a5cb45a6795d535d4df492f7f44b686
author Tim Barron <tjbarron@google.com> 1625251903 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625251903 +0000

Merge remote-tracking branch 'goog/androidx-platform-dev' am: 0dc99ac82a

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

Change-Id: I1e806c5b92501f8065ed410978bea80f5e933321