Skip to content
Snippets Groups Projects
Commit 97a06910 authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by android-build-merger
Browse files

resolve merge conflicts of 56ed8a4d to stage-aosp-master am: 2c4718fc

am: 77095f7c

Change-Id: Ib6b318da1518af49926c893f3cf20b64fd1a81e3
parents a40cb670 77095f7c
No related branches found
No related tags found
No related merge requests found
...@@ -112,6 +112,10 @@ allow adbd mnt_user_file:lnk_file r_file_perms; ...@@ -112,6 +112,10 @@ allow adbd mnt_user_file:lnk_file r_file_perms;
allow adbd media_rw_data_file:dir create_dir_perms; allow adbd media_rw_data_file:dir create_dir_perms;
allow adbd media_rw_data_file:file create_file_perms; allow adbd media_rw_data_file:file create_file_perms;
r_dir_file(adbd, apk_data_file)
allow adbd rootfs:dir r_dir_perms;
### ###
### Neverallow rules ### Neverallow rules
### ###
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment