commit | 16b1321dad1bcbd7a2326c51ce43f596a398990c | [log] [tgz] |
---|---|---|
author | Alexander Dorokhine <adorokhine@google.com> | Mon Jun 21 20:16:51 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 21 20:16:51 2021 +0000 |
tree | 1a754b5ff51679f37fde34f5f5f6e8a9cb300643 | |
parent | 63fc7e4396d4d8f517ae2ca4a273f970a6c1acc5 [diff] | |
parent | 8a6283ea5de39bd81f04556d7c380f58d08ef9c3 [diff] |
Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: 6bdac48ae6 am: 8a6283ea5d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/14055819 Change-Id: I586c71e2ecdc0e2daac9d017536b521944eeae9b