commit | 57ce5831872f841cae84b39e3fe5101d9e1c18e3 | [log] [tgz] |
---|---|---|
author | Tim Barron <tjbarron@google.com> | Fri Jan 08 01:01:21 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 08 01:01:21 2021 +0000 |
tree | f18c299debeceea2f551d552d1a0616433382e9d | |
parent | d746f42c5cb28dc53a360ec23ee875896e69e486 [diff] | |
parent | 7384fa7cc8b6b3a3d9c7512d7f296a4c8f7acfce [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into androidx-main am: 7384fa7cc8 Original change: https://android-review.googlesource.com/c/platform/external/icing/+/1541514 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ied14fc7cc3a539d2c9b2744de481a6d471e239eb