summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-24 04:00:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-24 04:00:06 +0000
commit02c1d117370d68ddaa5cb5303f22fbcdc34e2d7b (patch)
treecd22e2b633ac0a54d3e3219c8c8e6834ff89ce0f /libs/androidfw/StringPool.cpp
parent97c74fb6479735bf3a3081b6961d8be2a0f8e2e3 (diff)
parentbf061bfdc08b1235f523b09109f99b981d6a8b53 (diff)
Merge "[automerger skipped] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into sc-dev am: f6e715f998 -s ours am: 4a107edf40 -s ours am: 8e0c0c8b4e -s ours am: dd0ac21a94 -s ours am: 8db0861b17 -s ours" into tm-qpr-dev-plus-aosp am: bf061bfdc0 -s ours
am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391ce is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18359892 Change-Id: Ib9678d40cf3abb9a55c81f6110d02bbbb0e298c0 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