Skip to content
Commit d1b085d6 authored by Bruno Martins's avatar Bruno Martins Committed by android-build-merger
Browse files

[automerger skipped] Merge "AppOpsService: Watch op mode changes when an AppOp... 

[automerger skipped] Merge "AppOpsService: Watch op mode changes when an AppOp restriction dies" am: a96bafd7 am: 061fda06 am: 7f79ed14
am: 355e5f95 -s ours
am skip reason: change_id Ied66c7f49e1c483870048563d08fb57410f004ef with SHA1 b420a64e is in history

Change-Id: I37d8f727188b9a11629726a8842c48577d4d258f
parents 7f9a4c9e 355e5f95
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