diff options
| author | 2023-01-05 06:33:30 +0000 | |
|---|---|---|
| committer | 2023-01-05 06:33:30 +0000 | |
| commit | 79237771b4fdb97830c10733683127a5b53240a0 (patch) | |
| tree | a4ddfae549a64e6a324f0767505ecff586c984ef /libs/androidfw/StringPool.cpp | |
| parent | db841b741c631ebb7e85fd9165b6f43fa3a4dd0c (diff) | |
| parent | d837c389a912d7d921e3b47da729252bdb330954 (diff) | |
[automerger skipped] Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev am: cc678f0416 -s ours am: d837c389a9 -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: I2dcd82dbf3703f999d76797ad24dc0ae3799b988
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