diff options
| author | Ram Peri <ramperi@google.com> | 2023-06-20 20:45:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-20 20:45:40 +0000 |
| commit | 406747c6d695130b1cad8eae0c9436a8e259e78c (patch) | |
| tree | fac6efa1eba3410f5d602b53f17821b52bf38355 | |
| parent | cddb55078d3cd53468ca650769271d525e111ece (diff) | |
| parent | 7e72768ebc99903fdb9d541249a9b0cf546a601e (diff) | |
| download | robolectric-406747c6d695130b1cad8eae0c9436a8e259e78c.tar.gz | |
[automerger skipped] Merge branch 'upstream-google' into rng_import18 am: a99b56cbdb am: 95ace1ade5 -s ours am: 7e72768ebc -s ours
am skip reason: Merged-In Ife59e70205fa3b8dd3aa4cdef4689a8fd276073c with SHA-1 6660b73edd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23691011
Change-Id: Ie3f7012a82df68b8a21aca287eabce4b095626d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions