commit | 3cabfc4deac29c618b0ee6bfe8e315702fcb861c | [log] [tgz] |
---|---|---|
author | Alexander Dorokhine <adorokhine@google.com> | Thu Nov 19 08:09:14 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 19 08:09:14 2020 +0000 |
tree | a28cdf4e5570aaaddacf93d6d02660afeb68563c | |
parent | 2a9017f754c604f119afbf218b8d007f47cb3122 [diff] | |
parent | 815126b2dc9bfa46c1b7a5fd8598f93729b48295 [diff] |
Merge branch 'upstream-master' into androidx-master-dev am: 815126b2dc Original change: https://android-review.googlesource.com/c/platform/external/icing/+/1504265 Change-Id: Icc2dced9b8e3cb0e9b5287598145024dd468b8b8