diff options
| author | 2022-06-24 01:01:07 +0000 | |
|---|---|---|
| committer | 2022-06-24 01:01:07 +0000 | |
| commit | 45ac7debdd3965b7fbe23d81a69bf99f7bdfc406 (patch) | |
| tree | c73943ff472ac6df216765b1ff203ae17269e3de /libs/androidfw/StringPool.cpp | |
| parent | c25f0fe031d610b8a9aa7d7e0dfdfd39e58da7c6 (diff) | |
| parent | 002a760d742c86adc1d3099eab82e36bd0b5972d (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993
Change-Id: I7b7e160c9414c8ce571a7af491371a86a8ef6e9e
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