| commit | cc3575d2af08b440bc340913c33e89a74e79d9c9 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:07 2020 +0000 |
| tree | 461addbed55d7c08f13857fc628599b4e0dea404 | |
| parent | 7c89deb20ffaad7c258f258092243e696a9afe48 [diff] | |
| parent | ca53b78f5cfb26574dd0335b5a9bd9bbd03ebab8 [diff] |
[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -s ours am: 958c50e62d -s ours am: 5213d007b6 -s ours am: ca53b78f5c -s ours am skip reason: Change-Id Idc30a671f3fab9b67f82623cfe1feec44ac36a15 with SHA-1 36fd98c382 is in history Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1421774 Change-Id: I99fb39c1162c4410999ac75f69ac7713cf4a7db2