commit | 23ecc4b93679fd65c3f8279a867008babbe98794 | [log] [tgz] |
---|---|---|
author | Alexander Dorokhine <adorokhine@google.com> | Wed Dec 09 22:29:38 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 09 22:29:38 2020 +0000 |
tree | a28cdf4e5570aaaddacf93d6d02660afeb68563c | |
parent | 83875d4f6fd0877a1d3af6d1e4da39fbfc8b12cd [diff] | |
parent | 3cabfc4deac29c618b0ee6bfe8e315702fcb861c [diff] |
Merge branch 'upstream-master' into androidx-master-dev am: 815126b2dc am: 3cabfc4dea Original change: https://android-review.googlesource.com/c/platform/external/icing/+/1504265 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5672fe7b4192fd8433548e5afabea2a58dda76bd