commit | 18170eccb2ad31219995024038c54d7bec27ba2c | [log] [tgz] |
---|---|---|
author | Alexander Dorokhine <adorokhine@google.com> | Mon Jun 21 20:35:44 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 21 20:35:44 2021 +0000 |
tree | 1a754b5ff51679f37fde34f5f5f6e8a9cb300643 | |
parent | 44f7b5f866bf5fd610ffa2ea4fe2a4c268f0e9c2 [diff] | |
parent | d1161ed8cc0c51b13057b680f651a791515081d4 [diff] |
Merge remote-tracking branch 'androidx-platform-dev' into master am: deed1c7dfc am: e43582e662 am: d1161ed8cc Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/13779665 Change-Id: I49b6dc09b8fc2b375d073e5fd3b93052185fedf0