Skip to content
Commit 169f5853 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

[automerger skipped] Merge "Clean up the permission control code in framework"... 

[automerger skipped] Merge "Clean up the permission control code in framework" into qt-dev am: 4e1078e2 -s ours
am: c6edf97d -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 66404a12 is in history

Change-Id: Id93f949ff5ac017127f0066b5b428774a6a0b92f
parents fe61a871 c6edf97d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment