| commit | 7c89deb20ffaad7c258f258092243e696a9afe48 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Sep 01 22:10:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 22:10:04 2020 +0000 |
| tree | 461addbed55d7c08f13857fc628599b4e0dea404 | |
| parent | 21501f9bea2df23eb84ba7a6175a493aa797fb43 [diff] | |
| parent | 7434b54993f7c3456c3e4e9fc3eef14af191a910 [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 36fd98c382 -s ours am: 22cf1906cf -s ours am: 7434b54993 -s ours am skip reason: Change-Id I1634dc6e15698465b63881dfcfbb6c86bbd93e2f with SHA-1 9eee099922 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/12470182 Change-Id: I163d5711d38448b4f870de6498e3d1a0b6a54b61