| commit | 958c50e62d9d61cf1e37c50e68d0ca924c4c0c39 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 00:40:23 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:40:23 2020 +0000 |
| tree | 461addbed55d7c08f13857fc628599b4e0dea404 | |
| parent | 36fd98c3820caf7ee55b8db44b23573ce1064166 [diff] | |
| parent | d5f1dc5d216ecdb8ecfbb70f0877fb03cb9d3748 [diff] |
[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -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: I5c706020e85c6b4cc88c454cf0cc37e2be656e4e