resolve merge conflicts of 56ed8a4d to stage-aosp-master

Change-Id: Ic549f8c8060a17981302f2af75debf34595475bb

resolve merge conflicts of 56ed8a4d to stage-aosp-master
2c4718fc · Jeff Vander Stoep · 7d9487c9 · 56ed8a4d · 2c4718fc
Commit 2c4718fc authored 8 years ago by Jeff Vander Stoep
--- a/adbd.te
+++ b/adbd.te
@@ -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:file create_file_perms;

+r_dir_file(adbd, apk_data_file)
+
+allow adbd rootfs:dir r_dir_perms;
+
 ###
 ### Neverallow rules
 ###