| commit | 37aa33fcb1d1e7de18534ecebf7cd63825b8c201 | [log] [tgz] |
|---|---|---|
| author | Yu Liu <yudiliu@google.com> | Wed Aug 30 19:20:44 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Aug 30 19:20:44 2023 +0000 |
| tree | 8a8fd185a0bacb554a1471a886bac67e4f5df3ac | |
| parent | 8d7f2e41d1b519c4c70d452a3aa517e3148bbed7 [diff] | |
| parent | 520ab19c2351c06fcfd2f8eae088a55c171e2f2a [diff] |
Merge "Allowlist platform-test-annotations (new dependency of bouncycastle)" into main
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 9916451..2438726 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go
@@ -909,6 +909,9 @@ "merge_annotation_zips_test", + // bouncycastle dep + "platform-test-annotations", + // java_resources with multiple resource_dirs "emma", }