summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Jason Parks <jparks@google.com> 2024-01-04 23:16:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-04 23:16:20 +0000
commit471a0a39e130e875a2b83506db39075baf2c5bb5 (patch)
treec1cb8679688dfad257d92fb57d98cd2a59a58419 /libs/androidfw/StringPool.cpp
parent7b0a2694c2e3c561eaf94f9aa3b4024578ac0e3d (diff)
parent24249d7d8f4da85a9dcd8e13d0e241b7c2f974ec (diff)
[automerger skipped] Properly store device policy user restrictions. am: c747c3fd1a am: 24249d7d8f -s ours
am skip reason: Merged-In I66159f362b45d4c9e322754ff272c373b2557812 with SHA-1 24202a9b15 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25529244 Change-Id: I3c13e209bc2d952a6b14f1e7b5240e475a922508 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