summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Azhara Assanova <azharaa@google.com> 2024-11-27 10:45:33 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-11-27 10:45:33 +0000
commit946200b9f8a18e765649013139dd0e93a8dc270e (patch)
treeec52d38b4aa0a41a019bb18a4191bdee1fb32353 /libs/androidfw/ResourceTimer.cpp
parenta2a4d00d3f59e0ced82f4a3a2b2a26a2cfa0658a (diff)
parenta30fb7eaa3eeb5099c806f0f37c8b950ac7e7c2d (diff)
Merge changes from topic "aapm-support-dialog-settings-strings" into main
* changes: [AAPM] Update SPA settings to show advanced protection strings [AAPM] Add DevicePolicyManager#getEnforcingAdmin for settings pages
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions