[automerger skipped] Merge "Clean up the permission control code in framework" into qt-dev am: 4e1078e291 -s ours
am:c6edf97d59-s ours am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA166404a1224is in history Change-Id: Id93f949ff5ac017127f0066b5b428774a6a0b92f
This commit is contained in: