diff options
| author | 2023-03-31 20:06:22 +0000 | |
|---|---|---|
| committer | 2023-03-31 20:06:22 +0000 | |
| commit | e6903b0db60affdd31d2b1ad097eca2bdddeef87 (patch) | |
| tree | 3255109dc0824e26d7835326839ffedc5bf107dd /libs/androidfw/StringPool.cpp | |
| parent | 1334aa9cc0c3b935a04b35aadb747534ddd2be61 (diff) | |
| parent | 2140acaef4604f435f16974671b940aef30cefba (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: 2140acaef4 -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: Idbaa880a570035c33e5568325d9c4827189063be
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