diff options
| author | 2024-07-29 19:34:29 +0000 | |
|---|---|---|
| committer | 2024-07-29 19:34:29 +0000 | |
| commit | 2a2a41e13b3e93865dce1a22aa6e60d2781489b2 (patch) | |
| tree | ecfdecce35d27c5e2c235aa07768b07ff29ac62e /libs/androidfw/AttributeResolution.cpp | |
| parent | cf07e9b72d50283f3a4633451eaf25d4f9ac01a0 (diff) | |
| parent | 5b74a27f874ad09b29bd93acde9e0a34739f3299 (diff) | |
Merge "Prevent Sharing when FRP enforcement is in effect" into sc-dev am: f5424a3451 am: 1551fe7ce2 am: 1d562fcead am: df4e715833 am: fe8bcb7eab am: 9aa3c3ce44 am: 8a803498fb am: 5b74a27f87
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27899378
Change-Id: I4103c29b4bedf2e868db46067111ae9a23c27694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions