| commit | 21b742bc1da1235309d33fdb4d20980e40eaef34 | [log] [tgz] |
|---|---|---|
| author | Alex Humesky <ahumesky@google.com> | Mon Mar 22 20:54:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 22 20:54:55 2021 +0000 |
| tree | 4ff6434731886c36f5a6eef7606a7d31696542df | |
| parent | 32aece0dc7e347aa8989379208175831b290cc6e [diff] | |
| parent | cf1903cf5c87759121c4d2fe9392e337046be8cc [diff] |
Merge remote-tracking branch 'aosp/upstream-pre-alpha' into mergeUpstream am: dac61f349d am: ae03d131fe am: a59fc225f8 am: cf1903cf5c Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-rules_android/+/1646589 Change-Id: Ic1e6d8b966c28ddfb9085a2d4ffeb21bc622e92d