summaryrefslogtreecommitdiff
path: root/framework/java
diff options
context:
space:
mode:
author Justin Lannin <jlannin@google.com> 2025-02-06 08:36:46 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2025-02-06 08:36:46 -0800
commitdaa881cd21ab0668d4b78edd7474fcac16b8e8a0 (patch)
tree8e85f88804e821260290badd5a4efcef67beb358 /framework/java
parent7ca015743f6bbb7d64c7cc295848d54dcd0a1733 (diff)
parenta8d2c94143b1b74ab3f147fe56f72c04616b4f6e (diff)
Merge changes I73bbc51b,I6c7a3f9c into main
* changes: PermissionTests: Fix filepath to match package under test. AdminRestrictedPermissions: Add Health Permissions.
Diffstat (limited to 'framework/java')
0 files changed, 0 insertions, 0 deletions