resolved conflicts for merge of cfd49516 to mnc-dev-plus-aosp

Change-Id: I24fec247217aef4c9c1c2a7947bb07d91554ee45

resolved conflicts for merge of cfd49516 to mnc-dev-plus-aosp
9fc7607c · Nick Kralevich · d3cfe48a · cfd49516 · 9fc7607c
Commit 9fc7607c authored 10 years ago by Nick Kralevich
--- a/untrusted_app.te
+++ b/untrusted_app.te
@@ -111,6 +111,7 @@ userdebug_or_eng(`
  allow untrusted_app perfprofd_data_file:file r_file_perms;
  allow untrusted_app perfprofd_data_file:dir r_dir_perms;
 ')
+
 ###
 ### neverallow rules
 ###