tree 484397f21c18a2b1d8d4ac8db05d8a5ac5dd34cf
parent b715a547aec15ad76f73deef10e38f7098bea751
parent 648dd895c8bf883d883da8867d47bcaf844a83a6
author Terry Wang <tytytyww@google.com> 1604529251 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604529251 +0000

Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-dev am: 648dd895c8

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

Change-Id: I3976169687c061f8e2203c687fda098610348be2