diff options
| author | 2023-01-11 15:14:54 +0000 | |
|---|---|---|
| committer | 2023-01-11 15:14:54 +0000 | |
| commit | d853176905a3bb30d63684330749c3e25ef438c5 (patch) | |
| tree | 8ce1a9096028f14d28b1fdbdf428a48bd35dcd24 /libs/androidfw/AssetsProvider.cpp | |
| parent | b00fd1d78d0b47d07d0600e72b27403c9731f636 (diff) | |
| parent | 691f6232e5fa6c2ef264ba206e82db78290922b8 (diff) | |
[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-dev am: a124f7c2ba am: 691f6232e5 -s ours
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 f3a13e086b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20918023
Change-Id: I0bb15fbdcf28049d0eeccd29564cb744accc0957
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