summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-05-18 04:38:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-18 04:38:01 +0000
commitbb5255b7d221f57797699805fb823fc229d91302 (patch)
treeb4fb83dfc70420490610d604675270c35db59e5a /libs/androidfw/StringPool.cpp
parentb0ec7cce63ad4aba728f1af787fa7ba2675cf817 (diff)
parent043d3bd55ffcd84501cb60420ef2530d880fa5b6 (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: 043d3bd55f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993 Change-Id: I2f046c98476769427b282c92b9df1c8d75283cf6 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