tree 8bfa850f965870ed9585dcf1aba243f68022e2c5
parent cff142531cc92daef6bc97fb5958d0b1d7251f57
parent 0e9dd93880b334e6dca18d392802fb88ca67819c
author Terry Wang <tytytyww@google.com> 1602284435 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602284435 +0000

Merge "Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-dev" into androidx-master-dev am: 0e9dd93880

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

Change-Id: Ie0dc68d980979f892ceafdfbab39a0d9f58042a9