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