[automerger skipped] Merge "Clean up the permission control code in framework" into qt-dev

am: 4f47f2c827 -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 2bebfc2b87 is in history

Change-Id: Ia49181982198f2074a11afc881a047f86263699b
This commit is contained in:
Lorenzo Colitti
2019-05-14 23:49:27 -07:00
committed by android-build-merger

Diff Content Not Available