tree 73e0127c4f717ac38a8b5e27bfb9ff1a88323313
parent 82570b997347dc72e8d457390a83e937c79ade7c
parent 5129c0360c3733dcfd036ea5aaf9190c80df623a
author Tim Barron <tjbarron@google.com> 1607764035 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607764035 +0000

Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-dev am: 5129c0360c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I268cff57bf6de6ba3a213a053e58197997a7dfce