| commit | d583b2dd0e95e15180b25b42e3fa1fa122bce744 | [log] [tgz] |
|---|---|---|
| author | Terry Wang <tytytyww@google.com> | Fri Oct 09 23:00:35 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 09 23:00:35 2020 +0000 |
| tree | 8bfa850f965870ed9585dcf1aba243f68022e2c5 | |
| parent | cff142531cc92daef6bc97fb5958d0b1d7251f57 [diff] | |
| parent | 0e9dd93880b334e6dca18d392802fb88ca67819c [diff] |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-dev" into androidx-master-dev am: 0e9dd93880 Original change: https://android-review.googlesource.com/c/platform/external/icing/+/1446395 Change-Id: Ie0dc68d980979f892ceafdfbab39a0d9f58042a9