summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Karen Lu <kxylu@google.com> 2023-01-05 06:32:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-05 06:32:41 +0000
commitdb841b741c631ebb7e85fd9165b6f43fa3a4dd0c (patch)
treea4ddfae549a64e6a324f0767505ecff586c984ef /libs/androidfw/StringPool.cpp
parent724fbcd71d90f4ed2a656d21d2e7f3bd1fa2fddf (diff)
parent037b2007f7d6ff5f3774f92063fe8b93fff88259 (diff)
[automerger skipped] Revert "Use Mockito 4.6.1 API" am: 8827f5e197 -s ours am: 037b2007f7 -s ours
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20878393 Change-Id: If35da052dbfcc84e85eafd52fe08209ef7de86f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions