| commit | a4ca65957f6d770b2ddefbdf962a290bd86931ce | [log] [tgz] |
|---|---|---|
| author | Alyssa Ketpreechasawat <kalyssa@google.com> | Wed Dec 13 19:55:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 13 19:55:41 2023 +0000 |
| tree | ba1edda0f0f372704b91c221532ba260fa3bf047 | |
| parent | 93d2ba9ddcb85aa18a0db048403d95d124c98264 [diff] | |
| parent | 680c8cbce143d9c9d80f5e1aa958cd4c68cc73eb [diff] |
[automerger skipped] Merge "DO NOT MERGE: Drop prebuilt files to android source tree." into udc-qpr-dev am: 89e3084256 am: 680c8cbce1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/25490237 Change-Id: Ib7f207958448a052fa820fa698d2f32b26e45756 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>