commit | 59c9fcaf61beafb3c74275207286f920c2036afd | [log] [tgz] |
---|---|---|
author | Joel Galenson <jgalenson@google.com> | Fri Jul 16 18:44:49 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 16 18:44:49 2021 +0000 |
tree | e8bfca665365fed752c2757a50cb8e9dfb873b9a | |
parent | fecf76b422b281e2554cc6e1598ededf1dffbab8 [diff] | |
parent | 58baa3c20b14dd2e966db43dcd5c175a76da77b0 [diff] |
Merge "When merging tests, prefer non-blocklisted ones." am: 14b71a757b am: f6d0a0664a am: 8d835765f5 am: 58baa3c20b Original change: https://android-review.googlesource.com/c/platform/development/+/1768885 Change-Id: Ic34d3dc365729fe64769191833619451f7855265