diff options
| author | 2022-06-24 00:37:53 +0000 | |
|---|---|---|
| committer | 2022-06-24 00:37:53 +0000 | |
| commit | 002a760d742c86adc1d3099eab82e36bd0b5972d (patch) | |
| tree | 92c00db4e350f994105fd5356831aba459d8bfa2 /libs/androidfw/StringPool.cpp | |
| parent | 3aa32715aa042728f9abf32966e5f7f3332c8470 (diff) | |
| parent | 63d40c496ec06bd7b86c21e28e9c42705bb7d9e5 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993
Change-Id: If78f687fe15baf8b3f769f118429beafe30185e4
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