diff options
| author | 2023-01-04 15:23:34 +0000 | |
|---|---|---|
| committer | 2023-01-04 15:23:34 +0000 | |
| commit | f2a16dcd5dbe301242d6b4d713aec7c0e324807f (patch) | |
| tree | eede78da1f514053f6e81b1357302121d7b7248b /libs/androidfw/AssetsProvider.cpp | |
| parent | ab4b848c196f3584c2878c1ec598cd5336628ce9 (diff) | |
| parent | df30e8a45b6974bc9e2eae372bec42bf83054ffa (diff) | |
[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-qpr-dev am: df30e8a45b -s ours
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20749672
Change-Id: I7c88a12c52d8addad1f218099f943f107da588ea
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