1. seandroid
  2. Untitled project
  3. device/asus/flo

Commits

Stephen Smalley  committed 81931f9 Merge with conflicts

Merge branch 'master' into seandroid

Conflicts:
sepolicy/conn_init.te
sepolicy/kickstart.te
sepolicy/netmgrd.te
sepolicy/ppd.te

  • Participants
  • Parent commits 5144ffe, 9b2fbc4

Comments (0)