summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Karen Lu <kxylu@google.com> 2023-01-05 05:57:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-05 05:57:49 +0000
commit037b2007f7d6ff5f3774f92063fe8b93fff88259 (patch)
tree8e833b891d7046f7249a3dde4892dcac2c14114d /libs/androidfw/AssetsProvider.cpp
parent05e8733093c034747f2b6c80a841537a5d55248d (diff)
parent8827f5e1978064837ae9852ae53ae1924e8f3be8 (diff)
[automerger skipped] Revert "Use Mockito 4.6.1 API" am: 8827f5e197 -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: Id473c4e31a29c95db503fb17b70791f4d3462b99 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