diff options
| author | 2022-06-24 00:27:29 +0000 | |
|---|---|---|
| committer | 2022-06-24 00:27:29 +0000 | |
| commit | 63d40c496ec06bd7b86c21e28e9c42705bb7d9e5 (patch) | |
| tree | f832f5cb609ff00edaac4444a8258ef97eb2caf4 /libs/androidfw/StringPool.cpp | |
| parent | 6b7d2d10bab6a1c82dde135e7612e6a2539ddd9f (diff) | |
| parent | f642349402cfba13b103ef774d7bc23effc61b2a (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993
Change-Id: Iab7db57ed56986ca3853759e63362e8e63908460
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