summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-05-18 04:17:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-18 04:17:14 +0000
commit043d3bd55ffcd84501cb60420ef2530d880fa5b6 (patch)
treef97157eebac702029a0c9d873a8c7e723d6257c9 /libs/androidfw/StringPool.cpp
parent89ed3dc229cde1dbaea01e82e934f6b6e81f97d9 (diff)
parenta4bbe303ffa500ccb04c721b98e16e80a604406e (diff)
[automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46f3 am: a4bbe303ff -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993 Change-Id: I0e9added2c94f78647023c0bbdfe1c4fb625d20c 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