summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2022-08-11 01:23:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-11 01:23:11 +0000
commit421105f84c112ee43a5d5407892a88bc78fd615b (patch)
treeb07b89510101c98a25174650a17ef4a58aab4589 /libs/androidfw/StringPool.cpp
parent7bf2c43820ec20c74708828d77ad303daa733e2d (diff)
parentc358dbf44147932fb8186703f9c69c6730cb71af (diff)
[automerger skipped] Fix NPE when deleting old zen rules am: 7bb9cd92bf am: 8a021141ff am: b953b5eff6 -s ours am: 1cb919e374 -s ours am: 5f6329c80a -s ours am: ad8cb29baf -s ours am: 9cc147f64f -s ours am: c358dbf441 -s ours
am skip reason: Merged-In I069fcc124af24227fa50b61d4fc55d6dadc7a20b with SHA-1 93aa03a0db is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19202448 Change-Id: I8fcc68384f837774b23dca2575d0dcac9db6e88a 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