diff options
| author | 2022-06-24 01:51:00 +0000 | |
|---|---|---|
| committer | 2022-06-24 01:51:00 +0000 | |
| commit | ddc8025c2a4d837de58a2dbe91984899a173190f (patch) | |
| tree | 3a8e7671a8f6f9a6484d58fe29125b8041348875 /libs/androidfw/StringPool.cpp | |
| parent | 9b59009ec305a5008885ad5a56ab28182280a430 (diff) | |
| parent | 45ac7debdd3965b7fbe23d81a69bf99f7bdfc406 (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: f642349402 -s ours am: 63d40c496e -s ours am: 002a760d74 -s ours am: 45ac7debdd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993
Change-Id: I69fd6ba13f8d923e61eecf799e9d1249511f004c
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