diff options
| author | 2022-05-18 05:00:13 +0000 | |
|---|---|---|
| committer | 2022-05-18 05:00:13 +0000 | |
| commit | 329eb9d4b20700f0aba1b430a847edbbfbf345af (patch) | |
| tree | f423e0c35f9cd3646f6605430dd9ddf5d816f3ce /libs/androidfw/ResourceTimer.cpp | |
| parent | c657698519c7d8ab6c2188742e6c1101f1fad001 (diff) | |
| parent | bb5255b7d221f57797699805fb823fc229d91302 (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: bb5255b7d2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993
Change-Id: Id28c9e0890ee32a9440a7ddef2420c22f1ba6aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions