| commit | 030aca564833f30073782520f344d48612efdd15 | [log] [tgz] |
|---|---|---|
| author | Rex Hoffman <rexhoffman@google.com> | Tue Dec 06 21:11:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 06 21:11:28 2022 +0000 |
| tree | 230ab602ea9c06e3ca72253a2de9c25247dbf42a | |
| parent | 5f31db5201f137f8c4a1a6563cf859b676b70868 [diff] | |
| parent | 59373551e8bc081327dc6843a1c894dd5d847de7 [diff] |
[automerger skipped] Work around dependencies for external/robolectric changing in some builds. am: adfea881c0 am: 59373551e8 -s ours am skip reason: Merged-In If035db19297617fc0b0f6f6cae90f0a02ed0333a with SHA-1 5f31db5201 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/20582139 Change-Id: Id9b421a0ebccd0b48f9ed4e12959c8b495c3ae64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>