| commit | 9134dac0b17ca17fafbeaf66d2b655099a058630 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri Jun 11 01:56:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 11 01:56:43 2021 +0000 |
| tree | ac03f42540aec7d7d2ccdc50377af1d21b11f9ea | |
| parent | 45dd5391ed487f92ccab85f6ad26f98bdd2a1148 [diff] | |
| parent | 6f6035a29ecece22d52f7667c07fba5ec58ea3f6 [diff] |
Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa am: 6f6035a29e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1734372 Change-Id: I8c8a2f734c433c0cf6fe158fcbf26a75a82d0d0a