diff options
| author | 2023-03-31 19:05:35 +0000 | |
|---|---|---|
| committer | 2023-03-31 19:05:35 +0000 | |
| commit | 2140acaef4604f435f16974671b940aef30cefba (patch) | |
| tree | bf7b2d1d8d58d7179abe8fea054ac06503ce4ae4 /libs/androidfw/StringPool.cpp | |
| parent | 81115b21a59852a459da9b29c8009ead064f9610 (diff) | |
| parent | 2bc6696bae3d6fabb31dd493f71665f6dbd627fe (diff) | |
[automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e039e am: 0e7ecf6fbe -s ours am: a95419098d -s ours am: e6871844eb -s ours am: 769a0d367a -s ours am: 933ad6e1c8 -s ours am: 7bc82e9e2b -s ours am: 2bc6696bae -s ours
am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 3dbab873d6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22301867
Change-Id: I7fbfc6e7f23c08e1913c133dcf77418eec48e425
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