diff options
| author | 2023-01-05 05:58:37 +0000 | |
|---|---|---|
| committer | 2023-01-05 05:58:37 +0000 | |
| commit | d837c389a912d7d921e3b47da729252bdb330954 (patch) | |
| tree | 8e833b891d7046f7249a3dde4892dcac2c14114d /libs/androidfw/AssetsProvider.cpp | |
| parent | 037b2007f7d6ff5f3774f92063fe8b93fff88259 (diff) | |
| parent | cc678f041641677e9d223d1292b88c9db8b464a2 (diff) | |
[automerger skipped] Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev am: cc678f0416 -s ours
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20749672
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20878393
Change-Id: I940117bf653a8b443186d321aecd71dfce7c9f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions