commit | 6b514de34693827f86c034437fe229e1896efd66 | [log] [tgz] |
---|---|---|
author | Alexander Dorokhine <adorokhine@google.com> | Mon Jun 21 20:17:19 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 21 20:17:19 2021 +0000 |
tree | 1a754b5ff51679f37fde34f5f5f6e8a9cb300643 | |
parent | 055750e7359033bc5ab4265eed01ee598fbd5ba6 [diff] | |
parent | 1673a404e62704a08cec3e0c1686c37072771663 [diff] |
Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c586b8680c am: 8541fa7a31 am: e102320065 am: 1673a404e6 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/14505837 Change-Id: Ib55cfbff32f1eda4982341f430c0c256c42f75f1