Skip to content
Commit 40f9649c authored by Hai Zhang's avatar Hai Zhang Committed by android-build-merger
Browse files

[automerger skipped] Merge "DO NOT MERGE Set app op mode to allowed when... 

[automerger skipped] Merge "DO NOT MERGE Set app op mode to allowed when granting permissions to reset state." into qt-r1-dev am: 21de89cc
am: 5534e979 -s ours
am skip reason: subject contains skip directive

Change-Id: I0c2cdcd303e3b0611e3c96a7ab5c201a04f11cde
parents bf98c481 5534e979
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