Merge "[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: 64ef08037b -s ours" into tm-d1-dev-plus-aosp am: 1a15aef46e -s ours

Browse Source

am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391ce is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993

Change-Id: I4ebf3d1fafdbdc3a93103ab4e89ca6049888f4e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Automerger Merge Worker

2022-06-24 01:46:46 +00:00

parent 6d39b3cade 1a15aef46e

commit b2adb8fc1e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available