resolved conflicts for merge of bdec09b9 to lmp-mr1-dev-plus-aosp
Change-Id: I9f1dd4fd401df73006f79205557daa17313d36f4
Showing
- app.te 6 additions, 0 deletionsapp.te
- file.te 2 additions, 0 deletionsfile.te
- file_contexts 2 additions, 0 deletionsfile_contexts
- installd.te 6 additions, 0 deletionsinstalld.te
- system_app.te 7 additions, 1 deletionsystem_app.te
- system_server.te 2 additions, 0 deletionssystem_server.te
- zygote.te 3 additions, 0 deletionszygote.te
Loading
Please register or sign in to comment